PROJECT: Revision Reports

[Fromafar]

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

[Fromafar]

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:

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

This searches my own modifications first, next the AOM files, next the original Activision files, and finally the playtest files.
Note that ..\..\ctp2test.aom\default is searched before ..\..\ctp2.aom\ctp2_data\language.

[Fromafar]

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

[ctplinuxfan]

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

[Fromafar]

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

[J Bytheway]

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

[ctplinuxfan]

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)

[devoblue]

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

[ctplinuxfan]

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

[Fromafar]

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

[Fromafar]

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

[ctplinuxfan]

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

[Fromafar]

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.

[ctplinuxfan]

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:

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.

[J Bytheway]

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