PROJECT: Revision Reports

[ctplinuxfan]

Revision 369
r1566@linux3: holger | 2005-05-26 15:22:02 +0200
- fixed further #pragma once warnings
- added memory detection for linux in civ3_main.cpp
- fixed fontpaths for linux
- added initialization of SDL-Objects
- disable WIN32 specific code on !WIN32
- merged changes of ctp2_enums.h
- copied some aui_directx files as templates for sdl implementations

Changes by Johannes Sixt:
- Merged SDL Main-loop/Event handling from his civ_main.cpp
(further changes have to merged here)

r1567@linux3: holger | 2005-05-26 15:24:15 +0200
- added kdevelop session file to svn:ignore

[J Bytheway]

Revision 370
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/ctp/Makefile.am
M /branches/linux/ctp2_code/ctp/civ3_main.cpp
M /branches/linux/ctp2_code/ctp/civapp.cpp
M /branches/linux/ctp2_code/ctp/display.cpp
M /branches/linux/ctp2_code/ctp/display.h
M /branches/linux/ctp2_code/gs/events/GameEventDescription.h
M /branches/linux/ctp2_code/gs/fileio/prjfile.h
M /branches/linux/ctp2_code/gs/gameobj/message.h
M /branches/linux/ctp2_code/gs/slic/SlicBuiltinEnum.h
M /branches/linux/ctp2_code/gs/slic/SlicEngine.h
M /branches/linux/ctp2_code/net/io/net_io.h
M /branches/linux/ctp2_code/os/nowin32/windows.h
M /branches/linux/ctp2_code/ui/aui_ctp2/radarmap.h

.
- Added config.cache to svn:ignore

os/nowin32/windows.h
- Added some display-related types

ctp/display.{h,cpp}
- Renamed GUID field on DisplayDevice struct to stop compiler choking

ctp/civapp.cpp
- Guarded some COM calls under #ifndef USE_COM_REPLACEMENT
- Added several alternative SDL calls to DirectX GetTickCount()
- Added linux alternative nanosleep to Sleep

ctp/civ3_main.cpp
- Changed two NULLs to 0s to suppress warnings

ctp/Makefile.am
- Added touch commands to ctp/Makefile.am to ensure modification dates on
targets are updated and so prevent make becoming confused
- Interchanged last two include directories because for some reason .../ai
wasn't being included for me (an automake bug?)

gs/gameobj/message.h
- Changed an MSC_VER to a WIN32 for consistency

gs/fileio/prjfile.h
- Added a (presumed) missing #else

gs/slic/SlicBuiltinEnum.h
- Guarded another #pragma

gs/slic/SlicEngine.h, ui/aui_ctp2/radarmap.h
- Fixed some enum references

[J Bytheway]

Changes necessary to make the linux version compile under Windows again:

Revision 372
Changed paths:
M /branches/linux/ctp2_code/ctp/ctp2_enums.h
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3files.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/tracklen.cpp
M /branches/linux/ctp2_code/ctp/display.h
M /branches/linux/ctp2_code/gs/gameobj/Regard.h

tracklen.cpp
- Moved duplicate variable declaration

c3files.cpp
- Reverted change which had broken the CD checker

display.h
- Added standard header to describe changes in last revision

ctp2_enums.h
- Replaced inaccurate header
- Removed #includes to remove the need for more include paths in the subsiduary
projects

Regard.h
- Added missing #if

[J Bytheway]

...and now to fix the things I just broke under linux

Revision 373
Changed paths:
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3files.cpp
M /branches/linux/ctp2_code/gs/database/CivilisationDB.h
M /branches/linux/ctp2_code/gs/gameobj/player.h

c3files.cpp
- Applied a different fix to the problem of the CD volume names

CivilisationDB.h, player.h
- Added #includes to make up for the removals in ctp2_enums.h in the last
revision

[ctplinuxfan]

Again too long to include files modified...
Revision 374
r1574@linux3: holger | 2005-05-27 23:53:23 +0200
- Merged in changes from /trunk
- added warnings to C{,XX}FLAGS
- added double uintnn definitions by libtiff headers
- some VC++ pragmas guarded in #ifdef _MSC_VER
- guarded some #pragma once in #ifdef HAVE_PRAGMA_ONCE
- further include case fixes
- added std:: namespace prefix for STL-code in headers
- missing // added for comments after #endif
- COM initialization turned on again for WIN32 (due to movies)
- typename aui_DirectSurface -> aui_Surface in parameters
(increase portability, DD() is also in c3_UI)
- added aui_Factory::new_Surface for implementation independent
generation of aui_Surface instances (caller must care of delete)
- fixed invalid initializations of non-pointer types with NULL
- started adding extra size attributes and getters due to missing _msize()
under other operating systems than windows
- moved loop variable definitions out of loops to get iso c++ compliant code
- changed some parameters to const type & to prevent errors when passing
objects
- added aui_Surface::Blank(const uint32 &color) to fill a surface with color
- improved portability of pathnames
- replaced _stricoll with stricmp calls (one implementation is enough)
- added missing enum symbols to switches (just to reduce compiler warnings)
- fixed lazy handling of some non-const c cbr-datatypes passed to
const parameters
- added missing enumerations in GameOver.h:
GAME_OVER_LOST_OVERRUN_BY_SMURFS, GAME_OVER_WON_WORMHOLE
- template typename fixes
- resolved and removed some forward declarations
- renamed IUnknown to ICTP2Unknown
- added missing IC3CivArchive::IsStoring() for COM_REPLACEMENT
- made some destructors of virtual classes virtual
- changed some variables and attributes storing sizes to datatype size_t

Changes merged in by Johannes Sixt sources:
- inline _asm code translated to C++ code
- Event system fixes (type punned pointers unsupported on gcc)
i.e. especially GameEventManager, GameEventArgument and others
- added functions and prototype definitions to windows.h

[ctplinuxfan]

Remark on branch
/branches/linux:

Note, that aui_stuff should not compile under windows. The aui_direct* classes need to be reimplemented to exchange directx instances themselves, but not with the remainder of the code.

[ctplinuxfan]

Revision 375
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/gfx/spritesys/directoractions.h

r1576@linux3: holger | 2005-05-28 00:11:08 +0200
- GAME_OVER enum fix

[ctplinuxfan]

Small patch of another 100 files, here we go...

Revision 376
Changed paths:
M /branches/linux

r1578@linux3: holger | 2005-05-28 20:19:17 +0200
- deleted Makefile for non-gnu $(MAKE) portability
- deleted GNUmakefile.am for non-gnu $(MAKE) portability
- further filename fixes
- new target: libgsnewdb.la, so Makefile.am can be autogenerated by
ctpdb in future
- added hopefully all needed .cpp sources to ctp/Makefile.am
- further porting of win32 related code
- fixed still some const instances for const return types
- fixed some references where const references should be used
- further pathnames portability fixes
- wrong argument datatypes fixed

Changes merged by Johannes Sixt sources:
- GameEvent system non-POD arg fixes
- stub prototype for _fullpath

r1579@linux3: holger | 2005-05-28 22:34:57 +0200
- moved Makefile.am to GNUmakefile.am again
- pragma once fixes in 2 headers
- #include in windows.h
- svn:ignore properties fixed

[Edit]: Makefile and GNUmakefile.am reverted in my local r1579, so effectively nothing has changed

[Martin Gühmann]

Revision 377

Corrected using the wrong global variablesm, if you use the preprocessor to replace symbol names you should replace at least all the non global ones. Global variables have external linkage that is a problem if you do it like here. Hopefully it fixes also unautorisized memory usage.
modified trunk/ctp2_code/gs/slic/scyaccdefs.h
modified trunk/ctp2_code/ui/ldl/ldlyaccdefs.h

Some cosmetic changes, while I was searching for the cause of the unauthorised memory usage. Like whitespace usage and comments.
modified trunk/ctp2_code/gs/gameobj/player.h
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp
modified trunk/ctp2_code/gs/slic/slicif.cpp
modified trunk/ctp2_code/gs/utility/stringutils.cpp
modified trunk/ctp2_code/gs/utility/TurnCnt.cpp
modified trunk/ctp2_code/ui/interface/greatlibrary_util.cpp

[J Bytheway]

Revision 378
Changed paths:
M /branches/linux/*

- Guarded many #pragma once directives
- Added svn:executable property on autogen.sh

[ctplinuxfan]

Revision 379
Changed paths:
M /branches/linux

r1582@linux3: holger | 2005-05-29 16:10:45 +0200
- Merging changes by Martin Gühmann: r377@ctp2.kaan.dk/ctp2/trunk

r1585@linux3: holger | 2005-05-30 20:55:39 +0200
- Guarded some VC++ related pragmas
- fixed datatype of arguments to uLong for zlib calls
- added SDL_thread code
- interface methods in IC3CivArchive fixed to public
- fixed some temporary instance problems by creating a new object instance
in these blocks
- fixed datatype of size arguments to size_t
- added DBL_MAX define
- Fixed filecases in ctp/Makefile.am
- simplified gs/newdb/Makefile.am
- removed L postfix of arguments to std::max/std::min template, so
no compiler errors occur when u* datatype isn't long
- moved further loop variable declarations out of loop body
- added code in aui_Mouse
- commented out code in aui_Movie for !SDL
- commented out code in aui_Redbook for !SDL, need to revert changes
in ctp2_utils first
- commented out 8bit palette code in aui_Pixel (we use 16 bit)

Changes merged from Johannes Sixt sources:
- LOWORD and HIWORD macros
- prototype additions in windows.h
- SetFocus() replacement: Global windows instance g_winFocus
(definition must be added somewhere, later)
- use memcpy in aui_Blitter instead of asm code
- commented out aui_Font code completly for !SDL

[Martin Gühmann]

Revision 380

Savegames can now be reloaded if they were saved with a version of the game with less goods in the database4 than the current version, even if the extra goods were inserted in the middle. Trade routes are also fixed. So loading the Activision scenarios should work again. Note that these old savegames don't contain any extra goods.
modified trunk/ctp2_code/gs/gameobj/CityData.cpp
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/gs/gameobj/Resources.cpp
modified trunk/ctp2_code/gs/gameobj/Resources.h
modified trunk/ctp2_code/gs/gameobj/TradeRouteData.h
modified trunk/ctp2_code/gs/utility/gameinit.cpp
modified trunk/ctp2_code/gs/world/wldgen.cpp

Disabled some experimental changes in the slider algorithm that slipped though last time.
modified trunk/ctp2_code/ai/CityManagement/governor.cpp

[Fromafar]

Revision 381 Crash preventions + linux branch synchronisation

All files are from ctp2_code\gfx\tilesys:

modified BaseTile.h - revision 374 from linux branch
modified maputils.h - revision 374 from linux branch
modified tiledmap.cpp - crash preventions on game startup and exit, linux branch changes
modified tiledmap.h - partial application of linux branch changes
modified tiledraw.cpp - partial application of linux branch changes
modified TileDrawRoad.h - revision 374 from linux branch
modified TileInfo.h - revision 374 from linux branch
modified tileset.cpp - revision 374 from linux branch
modified tileset.h - revision 374 from linux branch
modified tileutils.cpp - linux changes
modified workmap.h - linux changes

[Fromafar]

Revision 382 Crash prevention, more linux branch synchronisation

modified ctp2_code/ai/strategy/scheduler/Goal_And_Squad_Types.h - linux branch synchronisation
modified ctp2_code/ai/strategy/scheduler/Plan.cpp - crash prevention, clean up
modified ctp2_code/ai/strategy/scheduler/Plan.h - clean up
modified ctp2_code/ai/strategy/scheduler/scheduler_types.h - linux branch synchronisation
modified ctp2_code/ai/strategy/squads/Squad.h - linux branch synchronisation
modified ctp2_code/ai/strategy/squads/squad_Strength.h - linux branch synchronisation
modified ctp2_code/gfx/tilesys/resourcemap.h - corrected compiler complaint

[Fromafar]

Revision 383 Memory cleanup + linux branch synchronisation

modified ctp2_code/ai/CityManagement/governor.cpp - added cleanup function
modified ctp2_code/ai/CityManagement/governor.h - added cleanup function, structure
modified ctp2_code/ai/ctp2/ctp_types.h - linux synchronisation
modified ctp2_code/ai/ctpai.cpp - scheduler and governor cleanup
modified ctp2_code/ai/ctpai.h - linux synchronisation
modified ctp2_code/ai/diplomacy/AgreementMatrix.h - linux synchronisation
modified ctp2_code/ai/diplomacy/Diplomat.h - linux synchronisation
modified ctp2_code/ai/diplomacy/diplomattypes.h - linux synchronisation
modified ctp2_code/ai/diplomacy/Foreigner.h - linux synchronisation
modified ctp2_code/ai/diplomacy/ProposalAnalysis.h - linux synchronisation
modified ctp2_code/ai/strategy/scheduler/scheduler.cpp - added cleanup function
modified ctp2_code/ai/strategy/scheduler/Scheduler.h - added cleanup function
modified ctp2_code/gs/gameobj/Player.cpp - structure, partial linux synchronisation
modified ctp2_code/gs/gameobj/player.h - structure, partial linux synchronisation