11-06-2005 00:39									#31
	Support Apolyton, buy Galactic Civilizations: Deluxe Edition

Revision 384 Corrected barbarian tribe name appearance, improved mod compatibility, linux synchronisation

modified ctp2_code/gs/database/profileDB.cpp - linux synchronisation
modified ctp2_code/gs/database/profileDB.h - linux synchronisation, centralised world shape handling
modified ctp2_code/ui/interface/loadsavescreen.cpp - linux synchronisation, tribe index check
modified ctp2_code/ui/interface/loadsavewindow.h - linux synchronisation
modified ctp2_code/ui/interface/spnewgamemapshapescreen.cpp - restored compatibility
modified ctp2_code/ui/interface/spnewgamemapshapescreen.h - linux synchronisation
modified ctp2_code/ui/interface/spnewgameplayersscreen.cpp - improved mod compatibility
modified ctp2_code/ui/interface/spnewgameplayersscreen.h - linux synchronisation
modified ctp2_code/ui/interface/spnewgametribescreen.cpp - Tribe index handling corrected
modified ctp2_code/ui/interface/spnewgametribescreen.h - Tribe index handling corrected
modified ctp2_code/ui/interface/spnewgamescreen.cpp - tribe index check
modified ctp2_code/ui/interface/spnewgamewindow.cpp - Tribe index handling corrected
modified ctp2_code/ui/interface/spnewgamewindow.h - restored compatibility, linux synchronisation
modified ctp2_data/english/gamedata/ldl_str.txt - typo corrected
modified ctp2_data/english/uidata/layouts/spnewgame.ldl - restored compatibility
modified ctp2_data/english/uidata/layouts/spnewgamepopups.ldl - restored compatibility

	12-06-2005 04:27									#32
	Browse Apolyton AD-FREE

quote: Originally posted by Fromafar modified ctp2_data/english/uidata/layouts/spnewgame.ldl - restored compatibility modified ctp2_data/english/uidata/layouts/spnewgamepopups.ldl - restored compatibility

And were are:

ctp2_data/french/uidata/layouts/spnewgame.ldl
ctp2_data/german/uidata/layouts/spnewgame.ldl
ctp2_data/italian/uidata/layouts/spnewgame.ldl
ctp2_data/japanese/uidata/layouts/spnewgame.ldl
ctp2_data/spanish/uidata/layouts/spnewgame.ldl

and:

ctp2_data/french/uidata/layouts/spnewgamepopups.ldl
ctp2_data/german/uidata/layouts/spnewgamepopups.ldl
ctp2_data/italian/uidata/layouts/spnewgamepopups.ldl
ctp2_data/japanese/uidata/layouts/spnewgamepopups.ldl
ctp2_data/spanish/uidata/layouts/spnewgamepopups.ldl

It shouldn't be my task to fix all the other languages for you. It should be the task of the persion who modified these files. Exspeacilly if you consider that we all have these files in the repository and they don't contain anything that requires the need of speaking French, German, Italian, Japanese or Spanish. Actual these two files here in question are identical for all the languages here. So a little bit of copy and paste shouldn't be a lot of work.

-Martin

	12-06-2005 19:20									#33
	Support Apolyton buy from Amazon

Revision 385
M branches/linux

r1577@linux3: holger | 2005-06-11 10:03:48 +0200
- merge from trunk to branches/linux: r381 - r383

r1581@linux3: holger | 2005-06-12 12:18:55 +0200
- trunk revisions r383 - r384 -> branches/linux

r1582@linux3: holger | 2005-06-12 16:09:40 +0200
- changed _LDADD to unique _LDFLAGS prefix
- added Makefile.common for common compiler/linker options


Sorry for the local revision decrease, i upgraded to subversion 1.2.0 + svk 1.0 and during repository recovery empty revisions were discarded.

	14-06-2005 00:14									#34
	Support Apolyton buy from Amazon

quote: Originally posted by Martin Gühmann And were are: [...] It shouldn't be my task to fix all the other languages for you. It should be the task of the persion who modified these files. [...] Actual these two files here in question are identical for all the languages here. So a little bit of copy and paste shouldn't be a lot of work.

The files are at my harddrive. I will put these at the server when I am able to contact it again. I have some problems connecting at the moment.
But we could argue whether it is your task after all.
It shouldn't be my task to repair - 6 times - the incompatibilities that others have created .

If the layout files are identical anyway, what do you think about putting these in the default section, so we don't have to update 6 versions every time?

And, for something completely different: does anyone know how to merge a branched file into the trunk while keeping the original information? For some files, I just want to put revision 374 (linux branch) on the trunk, without actually modifying anything (revision, author).

	14-06-2005 16:31									#35
	Lose 30 kilos (of popups)

quote: Originally posted by Fromafar And, for something completely different: does anyone know how to merge a branched file into the trunk while keeping the original information? For some files, I just want to put revision 374 (linux branch) on the trunk, without actually modifying anything (revision, author).

I'm not entirely sure what you're wanting to do, but I think svn move might be able to do it.

	15-06-2005 02:57									#36
	Inflate your Upload Space

What I want to do, is update the trunk with changes from the linux branch.

In most cases, the last trunk revision is at something like 362, and ctplinuxfan has made some perfectly valid improvements (e.g. guarding #pragma once, inserting comment-// when #endif is followed by text) in revision 374. When I merge this revision into the trunk and commit without making any changes, the file gets assigned a new revision number 380-something and has me as author.

I would like to have the trunk file revision being identified as revision 374 by ctplinuxfan, because it actually is his revision.

	15-06-2005 18:59									#37
	Support Apolyton buy from Amazon

Well, if you svn move the file from the linux branch to the trunk, then it will retain its linux modification history, with appropriate credit to ctplinuxfan (although you will be recorded as having been the person to move it). I think that does what you want. Of course, it's a bit tiresome to svn move something when you don't have it checked out, but if you're doing it a lot then I'm sure a script could ease that.

	16-06-2005 11:47									#38
	Support Apolyton

quote: Originally posted by J Bytheway Well, if you svn move the file from the linux branch to the trunk

Please do not move away changes files of a branch, the file is also needed in that branch.

quote: Originally posted by Fromafar What I want to do, is update the trunk with changes from the linux branch.

The only thing you can do is running svn merge to merge changes.

quote: I would like to have the trunk file revision being identified as revision 374 by ctplinuxfan, because it actually is his revision.

Well, the revision increase is logical: By merging the changes to a specific branch, you modify that branch, so the revision gets increased.
If anybody had commited a change to /trunk/foo.cpp in revision 377, inserting r374 from /branches/bar/foo.cpp before r377 of trunk would break the path of /trunk, so the branches must be independent because that's their purpose (change and test something which shouldn't break /trunk).

I share your opinion that the author gets lost during a conflict-less merge; the subversion book has the assumption that the author who merges the changes is somehow responsable for them to work.
If you resolve conflicts due to merges, it makes sense to keep you as the author, because you must make some modifications for the code to work again.

Somebody authorized could modify the revision property svn:author on merges without conflicts (revision properties may not be changed by default, because you could screw up the log, author, commit-date, etc.), but i don't mind if in a merged revision i'm not mentioned as the author for the changed lines.

During merges i commit source and destination branch and the revisions merged into the destination branch (log, author and changes are stored in repository). If we don't use the revision logs, we could try to agree on a common format for indicating the source of merges.

	17-06-2005 00:01									#39
	Enter the AD-FREE zone

quote: Originally posted by ctplinuxfan Please do not move away changes files of a branch, the file is also needed in that branch.

Of course I meant svn copy . Sorry.

	18-06-2005 23:09									#40
	Support Apolyton, buy Civilization 2

quote: Originally posted by Fromafar The files are at my harddrive. I will put these at the server when I am able to contact it again. I have some problems connecting at the moment.

Unfortunately I am having problems connecting to the SVN server. So I can't upload anything or use it.

quote: Originally posted by Fromafar But we could argue whether it is your task after all. It shouldn't be my task to repair - 6 times - the incompatibilities that others have created .

Well that's a big problem, most of the stuff are related to the *.ldl files. There aren't a lot of mods that modify them and if a mod modifies them then just a few.

So I don't see any sense in it to do these compatibility issures, just because there might be a mod in the far future that might modify such an file that isn't guarded. It is my opinion as long as a mod is under developement it can fix such things on the level of *ldl files, especially because such things clutter the code unecessarily.

quote: Originally posted by Fromafar If the layout files are identical anyway, what do you think about putting these in the default section, so we don't have to update 6 versions every time?

I think it isn't a big problem to put them into the default section, but then these files have to be remoded in the language specific position. I suspect it works as it works with the text files. If there is a file in the language folder then this is used otherwise the one in the default folder is used.

Well obviously we have to swap the precedence, so that we can still place there language specific files, but we have to add new ones if necessary.

-Martin

	20-06-2005 16:37									#41
	Help yourself to an AD-FREE life

I wasnt aware of any problems connecting to the svn server, ill look into it right away.

	20-06-2005 16:39									#42
	Support Apolyton buy from Amazon

hmmm, the process had ended for some unknown reason, it should be up and running again.

	20-06-2005 21:58									#43
	Put an end to popups!

Thanks Klaus, for making the server work again.

Revision 386 Layout updates

ctp2_data\<language>\uidata\layouts\spnewgame.ldl
ctp2_data\<language>\uidata\layouts\spnewgamepopups.ldl
ctp2_data\<language>\uidata\layouts\citystatus.ldl

When placing these in the default section, I don't think we should swap the priorities. I would prefer to have any language specific version override the default version - as it is now. Actually, my suggestion would be to move all Apolyton ctp2_data modifications to a new directory (thus not overwriting the original Activision ctp2_data). We can use the RuleSets option (in userprofile.txt, or some new in-game interface) to include the Apolyton data before the original Activision data.

	20-06-2005 23:21									#44
	Support Apolyton or Terrorists Win

Revision 387 Radius computation changes for non-wrapping worlds, linux branch synchronisation

Changed radius computation

Modified: ctp2_code\ai\mapanalysis\settlemap.cpp
Modified: ctp2_code\gfx\tilesys\tiledmap.cpp
Modified: ctp2_code\gs\gameobj\CityInfluenceIterator.cpp
Modified: ctp2_code\gs\gameobj\CityInfluenceIterator.h
Modified: ctp2_code\gs\world\MapPoint.cpp
Modified: ctp2_code\gs\world\MapPoint.h
Modified: ctp2_code\gs\world\wldgen.cpp
Modified: ctp2_code\robot\pathing\unitastar.cpp

linux branch synchronisation

Modified: ctp2_code\ai\mapanalysis\boundingrect.h
Modified: ctp2_code\ai\mapanalysis\mapanalysis.h
Modified: ctp2_code\ai\mapanalysis\mapgrid.h
Modified: ctp2_code\gs\world\Cell.cpp
Modified: ctp2_code\gs\world\Cell.h
Modified: ctp2_code\gs\world\UnseenCell.h
Modified: ctp2_code\gs\world\World.h
Modified: ctp2_code\gs\world\WrlEnv.cpp
Modified: ctp2_code\gs\world\WrlImprove.cpp
Modified: ctp2_code\gs\world\WrldCity.cpp
Modified: ctp2_code\gs\world\WrldPoll.cpp
Modified: ctp2_code\gs\world\worldevent.cpp
Modified: ctp2_code\robot\pathing\Astar.h
Modified: ctp2_code\robot\pathing\BFS.h
Modified: ctp2_code\robot\pathing\CityAstar.h
Modified: ctp2_code\robot\pathing\UnitAstar.h

	20-06-2005 23:37									#45
	Suffering from ads?

quote: Originally posted by Fromafar When placing these in the default section, I don't think we should swap the priorities. I would prefer to have any language specific version override the default version - as it is now.

Well for some reason I prefer also the way it is, but I don't know really why.

quote: Originally posted by Fromafar Actually, my suggestion would be to move all Apolyton ctp2_data modifications to a new directory (thus not overwriting the original Activision ctp2_data). We can use the RuleSets option (in userprofile.txt, or some new in-game interface) to include the Apolyton data before the original Activision data.

One way would be to modify civpath.txt, but that wouldn't work for zip files, because it is different in the various localized versions, so this would require an installer, erasing the original versions isn't a good idea either, as it needs again an installer and maybe someone did it so that he has the original version and our version sharing these files.

So the RuleSet is left. So far I don't know how it exactly works. Therefore I don't know whether we should use this or something else that is similar. Maybe a small readme would be helpful explaining how this feature work. By the way this is a pretty good idea for modders anyway.



Revision 388

Standardized trade route cost calculation to fix number of caravans needed for trade routes, and to make sure that everywhere this is used the same code is used.
modified ctp2_code/gs/gameobj/TradeRouteData.cpp
modified ctp2_code/gs/gameobj/tradeutil.cpp
modified ctp2_code/gs/gameobj/tradeutil.h

Made the code to compile on VC++ 6 to compile again:
modified ctp2_code/gs/gameobj/player.h - Added missing includes
modified ctp2_code/gs/gameobj/PlayerAI.cpp - Removed GetAllTileValue method
modified ctp2_code/gs/gameobj/TradeBids.cpp - Made the Unit argments of AddBit method const
modified ctp2_code/gs/gameobj/TradeBids.h - Made the Unit argments of AddBit method const

Added copy constructor as the default one generated by the compiler caused some problems with my debug version. However this rather looks like a bloody workaround, but now I don't want to go too deep into the details.
modified ctp2_code/ai/CityManagement/governor.cpp
modified ctp2_code/ai/CityManagement/governor.h

Some cosmetic changes since I was modifying these files anyway for some reason. Comments correction, standart casts, spellings, white space.
modified ctp2_code/gs/dbgen/ctpdb.cpp
modified ctp2_code/gs/gameobj/Player.cpp
modified ctp2_code/gs/world/Cell.h
modified bin/Readme.txt

	21-06-2005 01:20									#46
	Remove this text

Revision 389 Army corrections + linux branch synchronisation

Modified: ctp2_code\gs\gameobj\ArmyData.cpp - Fixed some missing message objects
Modified: ctp2_code\gs\gameobj\armyevent.cpp - relaxed assert, prevented memory leak reports

Linux branch synchronisation
Modified: ctp2_code\gs\gameobj\Army.cpp
Modified: ctp2_code\gs\gameobj\Army.h
Modified: ctp2_code\gs\gameobj\ArmyData.h
Modified: ctp2_code\gs\gameobj\ArmyEvent.h
Modified: ctp2_code\gs\gameobj\ArmyPool.cpp
Modified: ctp2_code\gs\gameobj\ArmyPool.h
Modified: ctp2_code\gs\slic\SlicObject.h - also removed some unused pool functionality
Modified: ctp2_code\gs\slic\slicobject.cpp

	21-06-2005 02:37									#47
	Help yourself to an AD-FREE life

Revision 390 Added AOM support, errors corrected, linux branch synchronisation

AOM support

Modified: ctp2_code/gs/slic/SlicBuiltin.cpp
Modified: ctp2_code/gs/slic/SlicEyePoint.cpp
Modified: ctp2_code/gs/slic/slicfunc.cpp

Crashes, memory leaks, and other errors

Modified: ctp2_code/gs/slic/SlicFrame.cpp
Modified: ctp2_code/gs/slic/slicif.cpp
Modified: ctp2_code/gs/slic/SlicStruct.cpp
Modified: ctp2_code/gs/slic/SlicSymbol.cpp
Modified: ctp2_code/gs/slic/slic.y

linux branch synchronisation

Modified: ctp2_code/gs/slic/SlicArray.h
Modified: ctp2_code/gs/slic/SlicBuiltin.h
Modified: ctp2_code/gs/slic/SlicBuiltinEnum.h
Modified: ctp2_code/gs/slic/SlicButton.h
Modified: ctp2_code/gs/slic/SlicConditional.h
Modified: ctp2_code/gs/slic/SlicConst.h
Modified: ctp2_code/gs/slic/SlicContext.cpp
Modified: ctp2_code/gs/slic/SlicDBConduit.h
Modified: ctp2_code/gs/slic/SlicEyePoint.h
Modified: ctp2_code/gs/slic/SlicFunc.h
Modified: ctp2_code/gs/slic/SlicNamedSymbol.h
Modified: ctp2_code/gs/slic/SlicRecord.h
Modified: ctp2_code/gs/slic/SlicStruct.h
Modified: ctp2_code/gs/slic/SlicSymbol.h
Modified: ctp2_code/gs/slic/SlicTriggerLists.h
Modified: ctp2_code/gs/slic/slicfuncai.h
Modified: ctp2_code/gs/slic/slicif_sym.h

The RuleSets behave more or less like an MSVC "include files directory"-list, except that each directory is actually a tree, and is searched as the usual ..\..\ctp2_data tree. So, language specific before default, and subdirectory dependent on what kind of file (e.g. picture, LDL-layout) you are looking for.

There is no in-game interface for it yet. You have to edit userprofile.txt manually. You may enter relative (to the executable) directory names, separated by semi-colons. The directories (trees) are searched from left to right, and the default ..\..\ctp2_data tree is automatically added at the end. So, leaving the list empty, will give you the usual tree (only). Example:

code:
RuleSets=..\..\..\ctp2test.aom;..\..\..\ctp2.aom\ctp2_data;..\..\..\ctp2.orig\ctp2_data

	24-06-2005 00:01									#48
	Avatar Enlargement: We've got the solution

Revision 391 Speeded up the unit and advance generation from goody huts

Modified: ctp2_code\gs\gameobj\Advances.cpp
Modified: ctp2_code\gs\gameobj\Advances.h
Modified: ctp2_code\gs\gameobj\GoodyHuts.cpp
Modified: ctp2_code\gs\gameobj\GoodyHuts.h

	25-06-2005 02:28									#49
	Get a bigger avatar today!

Revision 400
- backmerge from /trunk to /branches/linux (Revisions 386-391):
r1601@linux3: holger | 2005-06-24 22:50:08 +0200
r1584@linux3 (orig r386): Fromafar | 2005-06-20 18:38:15 +0200
r1585@linux3 (orig r387): Fromafar | 2005-06-20 20:13:36 +0200
r1586@linux3 (orig r388): Martin Gühmann | 2005-06-20 20:28:38 +0200
r1587@linux3 (orig r389): Fromafar | 2005-06-20 22:07:28 +0200
r1588@linux3 (orig r390): Fromafar | 2005-06-20 23:04:33 +0200
r1599@linux3 (orig r391): Fromafar | 2005-06-23 20:56:24 +0200

Revision 399
r1598@linux3: holger | 2005-06-24 19:21:50 +0200
- fixed further cases of included filenames
- further #pragma once guards
- garbage after #endif commented
- add X11R6 Fontpath to BitmapFontSearchpath
- refactored aui_*UI::CreateDirectScreen() -> aui_*UI::CreateScreen()
- refactored aui_*UI:: DestroyDirectScreen() -> aui_*UI:: DestroyScreen()
- further const parameter fixes, some reverted
- changed some standard integer type arguments to fixed bitwidth arguments
- removed further aui_Direct* instances used in ui/*/* code
- some temporary used as reference argument fixes
- guarded further DirectX video code for SDL version
- guarded further assembler code for SDL version

Changes merged by Johannes Sixt:
- ui/aui_sdl/aui_sdl* Implementation

Forgot this in the commit message:
Changes to libs/anet:
- compilation fixes for anet on amd64
- now anet compiles and links on amd64, but testprogram crashes
-> need a strict check on used datatypes and their size
Revision 398
r1597@linux3: holger | 2005-06-23 15:39:52 +0200
- added svn:executable flag for shell scripts
Revision 397
r1596@linux3: holger | 2005-06-23 15:27:55 +0200
- more seperate Makefile.am
- svn:ignore update for generated Makefiles
- svn:ignore update for anet
Revision 396
r1594@linux3: holger | 2005-06-21 22:35:44 +0200
- merged r390@ctp2.kaan.dk/ctp2/trunk by Fromafar from /trunk to /branches/linux
Revision 395
r1593@linux3: holger | 2005-06-21 22:30:10 +0200
- merged r389@ctp2.kaan.dk by Fromafar from /trunk to /branches/linux
Revision 394
r1592@linux3: holger | 2005-06-21 22:20:21 +0200
- merged r388@ctp2.kaan.dk by Martin Gühmann from /trunk to /branches/linux
Revision 393
r1591@linux3: holger | 2005-06-21 22:09:40 +0200
- merged r387@ctp2.kaan.dk by Fromafar from /trunk to /branches/linux
Revision 392
r1589@linux3: holger | 2005-06-21 22:07:28 +0200
- merged r386@ctp2.kaan.dk by Fromafar from /trunk to /branches/linux

	28-06-2005 02:13									#50
	Enter the AD-FREE zone

Revision 401 (trunk)

This could get messy , but I decided to commit it anyway, because it could solve some reported Slic problems.

Corrected Slic crashes, moved the pool creation out of SlicEngine to be able to reuse it over multiple instances.

Modified: ctp2_code\ctp\civapp.cpp
Modified: ctp2_code\gs\slic\SlicEngine.cpp
Modified: ctp2_code\gs\slic\SlicEngine.h
Modified: ctp2_code\gs\slic\SlicSegment.cpp
Modified: ctp2_code\gs\slic\SlicSegment.h

Small changes

Modified: ctp2_code\gs\slic\slic.l - added stdio.h to includes
Deletied: ctp2_code\ctp\userkeymap.txt - generated by executable

	28-06-2005 22:47									#51
	Enter the AD-FREE zone

Revision 402 (trunk)
Changed paths:
M /trunk/ctp2_code/gs/utility/gameinit.cpp
M /trunk/ctp2_code/ui/interface/spnewgamewindow.cpp
M /trunk/doc/user/playtest/Apolyton_README.txt

- Further alteration to allow for fewer than 3 civs
- Removed automatic tutorial advice on low difficulty settings
- Updated playtest readme

	29-06-2005 02:29									#52
	Support Apolyton, buy Civilization 2

Revision 403
Changed paths:
M /branches/linux

r1615@linux3: holger | 2005-06-28 23:27:16 +0200
- temporary Makefile.am for main program to resolve linker issues
- further header case fixes
- fixed loop variable scopes for behaviour of current ISO C++ compilers
- commended further garbage after #endif directives, but still some left
- further compile fixes, hopefully all
- changed NETFunc::Keys::key member name to curkey
(multiple inheritance attribute name conflict with NETFunc::Key::key)
- guarded IPC code (mainly PostMessage() calls)
- guarded some win32 ui code (like e.g. ShowWindow)

libs/anet:
- added libbsd.a target, because e.g. debian names it libbsd-compat.a
- added test program output files in svn:ignore

Changes by Johannes Sixt
- merged in further aui_code
- added nowin32.cpp (original winuser.cpp)

	30-06-2005 19:48									#53
	Get a bigger avatar today!

Revision 404
Modified: ctp2_code\gs\world\wldgen.cpp

Using /importmap to import a text map no longer causes the river mouths to be deleted

	30-06-2005 21:23									#54
	Lose 30 kilos (of popups)

Revision 405
[edit:] Merge from /trunk to /branches/linux
r1619@linux3: holger | 2005-06-30 17:57:34 +0200
r1611@linux3 (orig r401): Fromafar | 2005-06-27 23:03:31 +0200
Corrected Slic crashes, moved the pool creation out of SlicEngine to reuse it
over multiple instances.
r1613@linux3 (orig r402): john | 2005-06-28 19:46:07 +0200
- Further alteration to allow for fewer than 3 civs
- Removed automatic tutorial advice on low difficulty settings
- Updated playtest readme

r1617@linux3 (orig r404): devoblue | 2005-06-30 16:45:27 +0200
Using /importmap to import a text map no longer causes the river mouths to be
deleted - 2005-07-01 Shaun Dove


Revision 406
r1620@linux3: holger | 2005-06-30 18:21:25 +0200
- added ParseCommandLine prototype,
TBD: implementation
- fixed merged compile errors, added EndGameWindow.cpp to ctp2_code/Makefile.am

Last edited by ctplinuxfan on 30-06-2005 at 23:39

	30-06-2005 23:41									#55
	Remove this text

Revision 407 (trunk) Repaired crashes, linux synchronisation

Repaired crash when trying to draw a path without having an order selected (probably the DrawLegalMove crash).

Modified: ctp2_code\gfx\tilesys\TileHighlight.cpp

Repaired AOM crashes + memory black hole when using the city screen.

Modified: ctp2_code\gs\gameobj\CityData.cpp
Modified: ctp2_code\ui\interface\controlpanelwindow.cpp
Modified: ctp2_code\ui\interface\controlpanelwindow.h

Repaired crashes with some production finished messages.

Modified: ctp2_code\gs\slic\SlicArray.cpp
Modified: ctp2_code\gs\slic\SlicContext.cpp

Linux synchronisation.

Modified: ctp2_code\gfx\tilesys\tiledmap.cpp
Modified: ctp2_code\gfx\tilesys\tiledmap.h
Modified: ctp2_code\gfx\tilesys\tiledraw.cpp
Modified: ctp2_code\gfx\tilesys\tiledrawroad.cpp
Modified: ctp2_code\gs\slic\SlicEngine.cpp
Modified: ctp2_code\gs\slic\SlicEngine.h
Modified: ctp2_code\gs\slic\SlicFrame.cpp
Modified: ctp2_code\gs\slic\SlicSegment.cpp
Modified: ctp2_code\gs\slic\sliccmd.l
Modified: ctp2_code\gs\slic\slicobject.cpp

	01-07-2005 21:12									#56
	Increase Your PM Length

Revision 408 (trunk)
Added some missing statements to the fix of revision 407
Modified: ctp2_code\gs\slic\SlicContext.cpp

	04-07-2005 23:06									#57
	Inflate your Upload Space

Revision 409
Merged /trunk changes to /branches/linux

r1623@linux3 (orig r407): Fromafar | 2005-06-30 20:27:15 +0200
Repaired crashes + partial linux synchronisation

Repaired crash when trying to draw a path without having an order selected (pr
obably the DrawLegalMove crash).

Modified: ctp2_code\gfx\tilesys\TileHighlight.cpp

Repaired AOM crashes + memory black hole when using the city screen.
Modified: ctp2_code\gs\gameobj\CityData.cpp
Modified: ctp2_code\ui\interface\controlpanelwindow.cpp
Modified: ctp2_code\ui\interface\controlpanelwindow.h

Repaired crashes with some production finished messages.

Modified: ctp2_code\gs\slic\SlicArray.cpp
Modified: ctp2_code\gs\slic\SlicContext.cpp

Linux synchronisation.

Modified: ctp2_code\gfx\tilesys\tiledmap.cpp
Modified: ctp2_code\gfx\tilesys\tiledmap.h
Modified: ctp2_code\gfx\tilesys\tiledraw.cpp
Modified: ctp2_code\gfx\tilesys\tiledrawroad.cpp
Modified: ctp2_code\gs\slic\SlicEngine.cpp
Modified: ctp2_code\gs\slic\SlicEngine.h
Modified: ctp2_code\gs\slic\SlicFrame.cpp
Modified: ctp2_code\gs\slic\SlicSegment.cpp
Modified: ctp2_code\gs\slic\sliccmd.l
Modified: ctp2_code\gs\slic\slicobject.cpp

Revision 410
Changed paths:
M /branches/linux/ctp2_code/robot/utility/roboinit.cpp
M /branches/linux/ctp2_code/ui/aui_common/aui_hypertextbox.cpp

r1628@linux3: holger | 2005-07-03 18:53:49 +0200
Bugfixes by Johannes Sixt:
- Corrected invalid call to destructor
- corrected wrong sscanf cbr parameter

Revision 411
Changed paths:
M /branches/linux/ctp2_code/ui/interface/controlpanelwindow.h

r1629@linux3: holger | 2005-07-04 18:55:19 +0200
- fixed player.h include to lowercase

Revision 412
M /branches/linux/ctp2_code/libs/Makefile.am
M /branches/linux/ctp2_code/ui/interface/controlpanelwindow.cpp

r1630@linux3: holger | 2005-07-04 19:58:11 +0200
- readded temporary MapPoint to make code compile on linux
- anet now will only be compiled if Makefile changes or linux86.tar.gz does not exist

	05-07-2005 00:32									#58
	Put an end to popups!

Revision 413 (trunk) Repaired crash when inciting a revolution succeeds.

Modified: ctp2_code\gs\gameobj\ArmyData.cpp

Lots of small changes (prevented memory leak reports + linux branch synchronisation)

Modified: ctp2_code\gs\gameobj\lots of files

Is there any consistent rule for the case of linux #include files? After seeing a lot of "gold.h" -> "Gold.h" conversions, I now noticed some "Player.h" -> "player.h" ones. I don't want to make life difficult for you, but this is very likely to go wrong when I am making changes. MSVC6 does not complain about anything.

	05-07-2005 02:24									#59
	Support Apolyton

quote: Originally posted by Fromafar Is there any consistent rule for the case of linux #include files? After seeing a lot of "gold.h" -> "Gold.h" conversions, I now noticed some "Player.h" -> "player.h" ones. I don't want to make life difficult for you, but this is very likely to go wrong when I am making changes. MSVC6 does not complain about anything.

The case of the #include files must match the case the file is stored in the repository. When there is more than 1 header with the same name, but different case, the include search path order has to be taken into account as well (i.e. the case of the file topmost in the include search path, because MSVC6 behaves so).
The include path order in os/autoconf/Makefile.common is taken of the Debug build. E.g., there are:

code:

399 ctplinux       1926 Jun 24 22:59 ctp2_code/gs/utility/Globals.h
  1 activisi       4687 Oct 28  2003 ctp2_code/user-robotcom/shared/globals.h

where Globals.h is correct (gs/utility is the only path included here).

However i don't mind if file cases get mixed up, it's the quickest thing to merge.

	08-07-2005 06:28									#60
	Support Apolyton, buy GURPS/ Alpha Centauri

Revision 414 (branches/linux)

(Many files changed)

- Whitespace changes
- Removed '#' modifiers on %d formats in printf statements
- Sorted initializations into initialization order
- Changed some deletion of void* into deletion of other pointers
- Added many casts to sign or unsign integers
- Added parentheses around assignments use as truth values
- Altered several places where the address of a temporary value was being taken
- Reimplemented the problematic varargs code
- Added some header includes
- Made casts from floating point to integer types explicit
- Commented tokens after #endif directives
- Removed some spurious extern modifiers
- Replaced NULL by 0 when used as an integer rather than a pointer
- Made some integer constants explicitly unsigned to avoid conflicting
signedness in comparisons
- Commented out SlicEngine::IsKeyPressed since it is never used, makes little
sense, and caused warnings.
- Added newlines at end of files lacking them
- Made WatchList destructor virtual
- Guarded a #pragma warning
- Removed obsolete strstream headers

Last edited by J Bytheway on 08-07-2005 at 07:48