 |
|
tombom
|
|
Pining for the fjords
Oct 2004
time: 05:31
|
|
To repeat a question from the first page ( ) what should that PM look like to say that you agree to the EULA?
EDIT: Never mind.
Last edited by tombom on 24-03-2005 at 00:26
|
|
| |
|
|
|
tombom
|
|
Pining for the fjords
Oct 2004
time: 05:31
|
|
I've tried compiling a build using the latest SVN but whenever I try to run it I get a path error. I can't see which path due to the fact it pops under and is impossible to reach. Can anybody help?
|
|
| |
|
|
|
Martin Gühmann
|
 |
Berlin, Germany
Mar 2001
time: 06:31
|
|
quote:
Originally posted by E
It took a long time but I downloaded the files from the server. Does it do this evertime I have to get an update or can I just get the latest revision? |
Well if you followed John's advice it doesn't take so long but still takes a while, as the trunk folder alone contains 119 MB and the tags increase the size up to 1.01 GB.
Well I only update the trunk as Tortoise has to check whether you have modified files in your working copy, that takes a while and then it has to check whether there are modified files on the server, and then it updates only the files that are necessary and of course that doesn't take so long.
quote:
Originally posted by E
And how do I upload stuff? or make my revisions? |
That is simple, right click in Explorer on the folder you want to update and you find entries like Update, Commit... and TortoiseSVN. Of course Update is for updating your working copy. Commit... is for uploading and TortoiseSVN gives you some more options like Show Log were you can get a list of the revisions and from there you can go to statistics, the best is you look it that first, as long as you don't use the Commit... option you can't break anything on the server, of course if you use some options like delete on your local copy and forget it you will commit it later, and then you get some nasty results.
By the way you should also try at the log window the compare function of files and of course you should try the help button.
The more important is the add option that you can apply on folders but on single files as well, but for the start you don't need this.
You just have to add your modifications to a file and when it is finished you use th Commit... option.
But before you commit it you should post it before so that we all can be sure.
-Martin
|
|
| |
|
|
|
E
|
 |
July 24,2005 Ctp2 Tiles in sig!
May 1999
time: 21:31
|
|
I think there is an inconsistency. My copy of CityData.cpp I got from the server rev332 didn't match what I had from the last group that was posted in the alt files thread... the old file had this
code:
BOOL CityData::CanBuildUnit(sint32 type) const
{
const UnitRecord *rec = g_theUnitDB->Get(type);
if(!rec)
return FALSE;
MapPoint pos;
m_home_city.GetPos(pos);
if (!g_player[m_owner]->HasAdvance(rec->GetEnableAdvanceIndex()))
return FALSE;
sint32 o;
for(o = rec->GetNumObsoleteAdvance() - 1; o >= 0; o--) {
if(g_player[m_owner]->HasAdvance(rec->GetObsoleteAdvanceIndex(o)))
return FALSE;
}
if(g_exclusions->IsUnitExcluded(type))
return FALSE;
if(rec->GetCantBuild()) {
return FALSE;
}
if(rec->GetNumGovernmentType() > 0) {
sint32 i;
bool found = false;
for(i = 0; i < rec->GetNumGovernmentType(); i++) {
if(rec->GetGovernmentTypeIndex(i) == g_player[m_owner]->m_government_type) {
found = true;
break;
}
}
if(!found)
return FALSE;
}
if(rec->GetNuclearAttack() &&
wonderutil_GetNukesEliminated(g_theWonderTracker->GetBuiltWonders())) {
return FALSE;
}
if(rec->GetSlaveRaids() || rec->GetSettlerSlaveRaids() ||
rec->GetSlaveUprising()) {
if(wonderutil_GetFreeSlaves(g_theWonderTracker->GetBuiltWonders())) {
return FALSE;
}
}
if(rec->GetSlaveRaids() || rec->GetSettlerSlaveRaids()) {
sint32 i, n = g_player[m_owner]->m_all_units->Num();
for(i = 0; i < n; i++) {
if(g_player[m_owner]->m_all_units->Access(i).GetDBRec()->GetNoSlaves())
return FALSE;
}
}
if(rec->GetNoSlaves()) {
sint32 i, n = g_player[m_owner]->m_all_cities->Num();
for(i = 0; i < n; i++) {
if(g_player[m_owner]->m_all_cities->Access(i).CD()->SlaveCount() > 0)
return FALSE;
}
n = g_player[m_owner]->m_all_units->Num();
for(i = 0; i < n; i++) {
if(g_player[m_owner]->m_all_units->Access(i).GetDBRec()->GetSlaveRaids())
return FALSE;
}
}
if(rec->GetCreateParks() &&
!wonderutil_GetParkRangersEnabled(g_theWonderTrack
er->GetBuiltWonders())) {
return FALSE;
}
if(!g_slicEngine->CallMod(mod_CanCityBuildUnit, TRUE, m_home_city.m_id, rec->GetIndex()))
return FALSE;
if(!rec->GetMovementTypeLand() && !rec->GetMovementTypeTrade() && !rec->GetIsTrader()) {
if(g_theWorld->IsWater(pos.x, pos.y) && rec->GetSeaCityCanBuild()) {
return TRUE;
}
if((g_theWorld->IsLand(pos.x, pos.y) ||
g_theWorld->IsMountain(pos.x, pos.y)) &&
rec->GetLandCityCanBuild()) {
return TRUE;
}
if(rec->GetMovementTypeSea() || rec->GetMovementTypeShallowWater()) {
if(g_theWorld->IsNextToWater(pos.x, pos.y)) {
return TRUE;
}
return FALSE;
} else if(rec->GetMovementTypeAir()) {
return TRUE;
}
return FALSE;
}
return TRUE;
}
where as the server version is
code:
BOOL CityData::CanBuildUnit(sint32 type) const
{
// Added by Martin Gühmann
if(!g_player[m_owner]->CanBuildUnit(type))
return FALSE;
const UnitRecord *rec = g_theUnitDB->Get(type);
if(!rec)
return FALSE;
MapPoint pos;
m_home_city.GetPos(pos);
if(!g_slicEngine->CallMod(mod_CanCityBuildUnit, TRUE, m_home_city.m_id, rec->GetIndex()))
return FALSE;
if(!rec->GetMovementTypeLand() && !rec->GetMovementTypeTrade() && !rec->GetIsTrader()) {
if(g_theWorld->IsWater(pos.x, pos.y) && rec->GetSeaCityCanBuild()) {
return TRUE;
}
if((g_theWorld->IsLand(pos.x, pos.y) ||
g_theWorld->IsMountain(pos.x, pos.y)) &&
rec->GetLandCityCanBuild()) {
return TRUE;
}
if(rec->GetMovementTypeSea() || rec->GetMovementTypeShallowWater()) {
if(g_theWorld->IsNextToWater(pos.x, pos.y)) {
return TRUE;
}
return FALSE;
} else if(rec->GetMovementTypeAir()) {
return TRUE;
}
return FALSE;
}
return TRUE;
}
hould I add the other stuff back in along with my new code?
|
|
| |
|
|
|
tombom
|
|
Pining for the fjords
Oct 2004
time: 05:31
|
|
Remove strmiids.lib from the libraries to link against in Project Settings. It works fine.
|
|
| |
|
|
|
The Big Mc
|
 |
Of the universe / England
Oct 2001
time: 05:31
|
|
Done
Last edited by The Big Mc on 18-04-2005 at 03:38
|
|
| |
All times are GMT. The time now is 05:31.
Apolyton Time is 00:31. |
top of page
|
|
|
Forum Rules:
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts
|
HTML code is ON
vB code is ON
Smilies are ON
[IMG] code is ON
|
|
|
|
|
|
20-03-2005 22:48
.
.
|