Announcement

Collapse
No announcement yet.

PROJECT: Revision Reports

Collapse
This topic is closed.
X
X
 
  • Filter
  • Time
  • Show
Clear All
new posts

  • #61
    Revision 415 (branches/linux)
    Changed paths:
    M /branches/linux/ctp2_code/Makefile.am
    M /branches/linux/ctp2_code/gs/dbgen/Makefile.am
    M /branches/linux/ctp2_code/gs/dbgen/ctpdb.l
    M /branches/linux/ctp2_code/gs/events/GameEventArgument.cpp
    M /branches/linux/ctp2_code/gs/events/GameEventArgument.h
    M /branches/linux/ctp2_code/gs/gameobj/terrainutil.cpp
    M /branches/linux/ctp2_code/gs/slic/Makefile.am
    M /branches/linux/ctp2_code/gs/slic/SlicConditional.cpp
    D /branches/linux/ctp2_code/gs/slic/scyaccdefs.h
    M /branches/linux/ctp2_code/gs/slic/slic.l
    M /branches/linux/ctp2_code/gs/slic/slic.y
    M /branches/linux/ctp2_code/gs/slic/sliccmd.cpp
    M /branches/linux/ctp2_code/gs/slic/sliccmd.h
    M /branches/linux/ctp2_code/gs/slic/sliccmd.l
    M /branches/linux/ctp2_code/gs/slic/sliccmd.y
    M /branches/linux/ctp2_code/gs/slic/slicif.cpp
    M /branches/linux/ctp2_code/gs/utility/gameinit.cpp
    M /branches/linux/ctp2_code/gs/utility/stringutils.cpp
    M /branches/linux/ctp2_code/os/linux/civctp2.kdevelop
    D /branches/linux/ctp2_code/ui/interface/spscreen.cpp
    D /branches/linux/ctp2_code/ui/interface/spwindow.cpp
    D /branches/linux/ctp2_code/ui/interface/spwindow.h
    M /branches/linux/ctp2_code/ui/slic_debug/watchlist.cpp

    - Fixed linking errors arising from the changes I made in the previous revision
    - Made all the lexer/parser sections of the code have unique prefixes (both as files and as functions), and changed the other code and Makefile.ams appropriately (NB: the compile commands for the MS projects will have to be changed to make this compile under Windows again).
    - Removed duplicate definitions of g_theGovernmentDB and g_theWonderMovieDB from gameinit.cpp
    - Removed scyaccdefs.h, spscreen.cpp, spwindow.cpp and spwindow.h since none of them are needed any more
    Last edited by J Bytheway; July 17, 2005, 10:17.

    Comment


    • #62
      Revision 416 (trunk) Slic improvements

      Repaired memory leaks
      Modified: ctp2_code\gs\slic\SlicContext.cpp

      Prevented crashes with invalid strings
      Modified: ctp2_code\gs\slic\SlicNamedSymbol.cpp
      Modified: ctp2_code\gs\slic\SlicSymbol.cpp
      Modified: ctp2_code\gs\slic\SlicSymbol.h

      Added missing include
      Modified: ctp2_code\gs\slic\sliccmd.y

      Added arguments to some diplomatic proposals (Activision 1.1 patch reimplementation?)
      Modified: CTP2\ctp2_code\gs\slic\slicfuncai.cpp

      Comment


      • #63
        Revision 417
        M /branches/linux/configure.in
        M /branches/linux/ctp2_code/Makefile.am
        M /branches/linux/ctp2_code/gfx/gfx_utils/tiffutils.cpp
        M /branches/linux/ctp2_code/gfx/gfx_utils/tiffutils.h
        M /branches/linux/ctp2_code/gfx/spritesys/FacedSprite.cpp
        M /branches/linux/ctp2_code/gfx/spritesys/FacedSprite.h
        M /branches/linux/ctp2_code/gfx/spritesys/FacedSpriteWshadow.cpp
        M /branches/linux/ctp2_code/gfx/spritesys/spriteutils.cpp
        M /branches/linux/ctp2_code/gfx/spritesys/spriteutils.h
        M /branches/linux/ctp2_code/gs/dbgen/Makefile.am
        M /branches/linux/ctp2_code/gs/gameobj/terrainutil.cpp
        M /branches/linux/ctp2_code/gs/gameobj/terrainutil.h
        M /branches/linux/ctp2_code/gs/slic/Makefile.am
        M /branches/linux/ctp2_code/gs/slic/SlicEngine.cpp
        M /branches/linux/ctp2_code/libs/Makefile.am
        M /branches/linux/ctp2_code/ui/aui_common/aui_surface.h
        M /branches/linux/ctp2_code/ui/aui_common/aui_ui.cpp
        M /branches/linux/ctp2_code/ui/aui_ctp2/keyboardhandler.h
        M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdl.cpp
        M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdl.h
        M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlmouse.cpp
        M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlmouse.h
        M /branches/linux/ctp2_code/ui/slic_debug/segmentlist.cpp
        M /branches/linux/ctp2_code/ui/slic_debug/segmentlist.h
        M /branches/linux/ctp2_code/ui/slic_debug/sourcelist.cpp
        M /branches/linux/ctp2_code/ui/slic_debug/sourcelist.h
        M /branches/linux/ctp2_code/ui/slic_debug/watchlist.cpp
        M /branches/linux/ctp2_code/ui/slic_debug/watchlist.h

        r2292@linux3: holger | 2005-07-14 21:41:20 +0200
        - Guarded slic_debug code
        - added size_t return parameter (to remove _msize calls)
        - corrected flex --prefix argument to -P argument
        - added missing sprite code relating _msize() workaround

        Changes by Johannes Sixt
        - further aui_sdl code


        Further comment: #define CTP2_ENABLE_DEBUGSLIC 1 is needed to compile ui/slicdebug (which doesn't link on linux). It will be added to config_win32.h when i merge the windows changes back to the linux branch.

        Comment


        • #64
          Revision 418 (trunk)

          Redesigned CityData::Copy method so that it does not use the Serialize method anymore to copy data from A to C first and then to copy data from C to B instead of copying the data from A to B directly. This also replaces a fix by Fromafar for a memory leak, that actual made the game crash.
          modified ctp2_code/gs/gameobj/bldque.cpp
          modified ctp2_code/gs/gameobj/BldQue.h
          modified ctp2_code/gs/gameobj/CityData.cpp
          modified ctp2_code/gs/gameobj/citydata.h
          modified ctp2_code/gs/gameobj/Happy.cpp
          modified ctp2_code/gs/gameobj/Happy.h

          RadiusIterator constructor restored to match behaviour of original game. This defect reduces the aggressivity of the AI severely. Expanson was slowed down. City spacing was disturbed as well
          modified ctp2_code/gs/world/MapPoint.cpp
          Civ2 military advisor: "No complaints, Sir!"

          Comment


          • #65
            Revision 419 (branches/linux)
            Changed paths:
            M /branches/linux/ctp2_code/ai/mapanalysis/mapgrid.h
            M /branches/linux/ctp2_code/ctp/ctp2_utils/c3cmdline.cpp
            M /branches/linux/ctp2_code/ctp/ctp2_utils/c3debug.cpp
            M /branches/linux/ctp2_code/ctp/ctp2_utils/netconsole.cpp
            M /branches/linux/ctp2_code/ctp/debugtools/debugmemory.h
            M /branches/linux/ctp2_code/gfx/spritesys/SpriteFile.h
            M /branches/linux/ctp2_code/gs/fileio/CivPaths.cpp
            M /branches/linux/ctp2_code/gs/fileio/CivPaths.h
            M /branches/linux/ctp2_code/gs/slic/SlicContext.cpp
            M /branches/linux/ctp2_code/gs/slic/SlicStack.cpp
            M /branches/linux/ctp2_code/gs/slic/SlicStruct.cpp
            M /branches/linux/ctp2_code/gs/slic/slic.y
            M /branches/linux/ctp2_code/gs/utility/MapFile.cpp
            M /branches/linux/ctp2_code/os/autoconf/Makefile.common
            M /branches/linux/ctp2_code/os/linux/civctp2.kdevelop
            M /branches/linux/ctp2_code/os/nowin32/nowin32.cpp
            M /branches/linux/ctp2_code/robot/aibackdoor/civarchive.h
            M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdl.cpp
            M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlmouse.cpp

            General fixes:
            - Made bare linux versions of _fullpath and MessageBox for minimal
            functionality and debugging.
            - Added -lltdl to CTP2_LDFLAGS
            - Replaced multi-character constants with their hex equivalents
            - Corrected check of SDL_Init return value
            - Sorted initializers of aui_sdlmouse

            Fixes needed when debugging symbols defined:
            - Corrected some #includes
            - Wrote alternatives to Windows networking and file management code
            - Removed '#' flags from '%d' formats
            - Changed '#else if' to '#elif'
            - Added (un)signing casts
            - Wrote code to change windows file seperators in civpaths.txt into localized
            file seperators
            - Clarified some printf arguments

            Comment


            • #66
              Revision 420 (trunk/)

              Updated AI sliders optimization
              modified ctp2_code/ai/CityManagement/governor.cpp
              modified ctp2_code/ai/CityManagement/governor.h
              modified ctp2_code/ai/ctpai.cpp

              Added some casts
              modified ctp2_code/mapgen/PlasmaGen2.cpp

              If the sliders on the national management dialog cause and effect tab are modified all the values of food, production and gold are updated, as happiness modifes crime and crime modifies the amount of food, production and gold left and production modifies pollution and pollution modifies happiness and so on.
              modified ctp2_code/ui/interface/CauseAndEffectTab.cpp

              Fixed typos, white space, etc.
              modified bin/Readme.txt
              modified ctp2_code/gs/slic/SlicFrame.cpp
              modified ctp2_code/mapgen/PlasmaGen2.h
              Last edited by Martin Gühmann; July 19, 2005, 13:01.
              Civ2 military advisor: "No complaints, Sir!"

              Comment


              • #67
                DP
                Last edited by Martin Gühmann; July 19, 2005, 13:01.
                Civ2 military advisor: "No complaints, Sir!"

                Comment


                • #68
                  Revision 421
                  Changed paths:
                  M /branches/linux/configure.in
                  M /branches/linux/ctp2_code/ctp/civ3_main.cpp
                  M /branches/linux/ctp2_code/ctp/civapp.cpp
                  M /branches/linux/ctp2_code/ctp/ctp2_utils/c3errors.cpp
                  M /branches/linux/ctp2_code/ctp/ctp2_utils/c3files.cpp
                  M /branches/linux/ctp2_code/ctp/display.cpp
                  M /branches/linux/ctp2_code/gfx/gfx_utils/targautils.cpp
                  M /branches/linux/ctp2_code/gfx/gfx_utils/targautils.h
                  M /branches/linux/ctp2_code/gfx/gfx_utils/tiffutils.cpp
                  M /branches/linux/ctp2_code/gfx/gfx_utils/tiffutils.h
                  M /branches/linux/ctp2_code/gfx/spritesys/FacedSprite.cpp
                  M /branches/linux/ctp2_code/gfx/spritesys/Sprite.cpp
                  M /branches/linux/ctp2_code/gs/database/PlayListDB.cpp
                  M /branches/linux/ctp2_code/gs/fileio/CivPaths.cpp
                  M /branches/linux/ctp2_code/os/autoconf/os_defs.m4
                  M /branches/linux/ctp2_code/os/nowin32/nowin32.cpp
                  M /branches/linux/ctp2_code/os/nowin32/windows.h
                  M /branches/linux/ctp2_code/ui/aui_common/aui_cursor.cpp
                  M /branches/linux/ctp2_code/ui/aui_common/aui_image.cpp
                  M /branches/linux/ctp2_code/ui/aui_common/aui_image.h
                  M /branches/linux/ctp2_code/ui/aui_common/aui_mouse.cpp
                  M /branches/linux/ctp2_code/ui/aui_common/aui_textbase.cpp
                  M /branches/linux/ctp2_code/ui/aui_ctp2/c3_popupwindow.cpp
                  M /branches/linux/ctp2_code/ui/aui_ctp2/c3imageformats.cpp
                  M /branches/linux/ctp2_code/ui/aui_ctp2/c3imageformats.h
                  M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdl.cpp
                  M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlui.cpp
                  M /branches/linux/ctp2_code/ui/ldl/ldl_file.cpp
                  M /branches/linux/ctp2_code/ui/ldl/ldlif.cpp

                  r2407@linux3: holger | 2005-07-18 16:37:59 +0200
                  - further const fixes
                  - ported further native win32 path algorithms
                  - initialization fixes
                  bugfixes:
                  - possible memory leak in civapp.cpp
                  - no displaymode: default to 800x600 (display.cpp)
                  - better recognition of invalid playlist.txt

                  Comment


                  • #69
                    Revision 422

                    Updated project files so that the game compiles without any problems and links against the files libs of DirectX 9.0 without any problems. Backwards compatibilty to older versions of DirectX was not tested.
                    modified trunk/ctp2_code/ctp/civctp.dsp
                    modified trunk/ctp2_code/mapgen/Crater.dsp
                    modified trunk/ctp2_code/mapgen/fault.dsp
                    modified trunk/ctp2_code/mapgen/geometric.dsp
                    modified trunk/ctp2_code/mapgen/Plasma2.dsp

                    New Apolyton specific source code edition readme based on the original readme to reflect the most important changes in comparision to the original to make the code compile.
                    added trunk/Apolyton CTP2 Source Code_Readme.txt

                    Made the code linkable under configuration Win32 Optimize Test
                    modified trunk/ctp2_code/robot/pathing/astar.cpp

                    Removed a problem with the Win32 Test configuration. However this configuration doesn't compile anyway and much more work has to be done to make it compile. So I decided it isn't worth the effort and I quiit the fising of this configuration, but this little modification is left.
                    modified trunk/ctp2_code/gs/database/profileDB.h
                    Civ2 military advisor: "No complaints, Sir!"

                    Comment


                    • #70
                      Revision 423
                      Changed paths:
                      M /branches/linux/ctp2_code/gs/fileio/CivPaths.cpp
                      M /branches/linux/ctp2_code/gs/newdb/DBLexer.l
                      M /branches/linux/ctp2_code/gs/slic/slic.l
                      M /branches/linux/ctp2_code/os/linux/civctp2.kdevelop
                      M /branches/linux/ctp2_code/ui/aui_common/aui_textbase.cpp
                      M /branches/linux/ctp2_code/ui/ldl/ldl.l

                      - Fixed lexers to cope with both forms of line endings
                      - Tweaked debugging output / assertions

                      Comment


                      • #71
                        Revisions 424-425
                        Changed paths:
                        M /branches/linux/ctp2_code/ctp/civ3_main.cpp
                        M /branches/linux/ctp2_code/ctp/civapp.cpp
                        M /branches/linux/ctp2_code/ctp/ctp2_utils/c3files.cpp
                        M /branches/linux/ctp2_code/ctp/ctp2_utils/c3mem.cpp
                        M /branches/linux/ctp2_code/ctp/display.cpp
                        M /branches/linux/ctp2_code/gs/fileio/CivPaths.cpp
                        M /branches/linux/ctp2_code/gs/slic/slicobject.cpp
                        M /branches/linux/ctp2_code/os/linux/civctp2.kdevelop
                        M /branches/linux/ctp2_code/sound/soundmanager.cpp
                        M /branches/linux/ctp2_code/ui/aui_common/aui_image.cpp
                        M /branches/linux/ctp2_code/ui/aui_common/aui_image.h
                        M /branches/linux/ctp2_code/ui/aui_common/aui_ui.cpp
                        M /branches/linux/ctp2_code/ui/aui_ctp2/c3imageformats.cpp
                        M /branches/linux/ctp2_code/ui/aui_directx/aui_directui.cpp
                        M /branches/linux/ctp2_code/ui/aui_directx/aui_directui.h
                        M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdl.cpp
                        M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlui.cpp
                        M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlui.h

                        r2434@linux3: holger | 2005-07-21 09:45:27 +0200
                        bugfixes:
                        - rename to aui_*ui::CreateScreen revoked to ui_*ui::CreateNativeScreen
                        (unwanted overload of virtual aui_ui::CreateScreen)
                        - assure single SDL_Init() call (in civ3_main.cpp)
                        - sound-subsystem initialized seperately (theoretically playing with no
                        sound should be possible)

                        Changes by Johannes Sixt:
                        - Added further aui_SDL code (ui/aui_sdl/*)
                        - SDL-Implementation of TargaImageFormat::Load (c3imageformats.cpp)
                        - Added Method aui_image::AttachSurface(aui_Surface *) to provide
                        a surface containing the image within aui_ImageFormat::Load()

                        Comment


                        • #72
                          Revision 426

                          Fixed bug that doesn't allow to rush buy an build item, if you inserted it before Capitalisation or Infrastructure and Capitalisation or Infrastructure was the first build item.
                          modified ctp2_code/gs/gameobj/CityData.cpp

                          Added some casts.
                          modified ctp2_code/ui/interface/EditQueue.cpp
                          Civ2 military advisor: "No complaints, Sir!"

                          Comment


                          • #73
                            Revision 427
                            Changed paths:
                            M /branches/linux/ctp2_code/libs/anet
                            A /branches/linux/ctp2_code/libs/anet/GNUmakefile.am
                            A /branches/linux/ctp2_code/libs/anet/README.modifications
                            M /branches/linux/ctp2_code/libs/anet/demo/utils/dpcrc32.c
                            M /branches/linux/ctp2_code/libs/anet/demo/utils/dpcrc32.h
                            M /branches/linux/ctp2_code/libs/anet/h/anet.h
                            A /branches/linux/ctp2_code/libs/anet/h/anet_types.h
                            M /branches/linux/ctp2_code/libs/anet/src
                            M /branches/linux/ctp2_code/libs/anet/src/3rdparty
                            A /branches/linux/ctp2_code/libs/anet/src/3rdparty/GNUmakefile.am
                            A /branches/linux/ctp2_code/libs/anet/src/GNUmakefile.am
                            M /branches/linux/ctp2_code/libs/anet/src/linux/uudp/uudps.c

                            r2437@linux3: holger | 2005-07-24 13:05:40 +0200
                            anet changes:
                            - added standard int prototypes definitions
                            - added first GNUmakefile.am templates

                            bugfixes:
                            - fixed amd64 segfault in dpcrc32.c due to use of 64bit integers
                            - amd64 segfault in uudps.c due to use of invalid ipv4 address types

                            Revision 428
                            r2438@linux3: holger | 2005-07-24 13:55:58 +0200
                            - enabled _BFR_ for any build
                            - c3files.cpp now primarily uses cd drive numbers instead of names
                            - more const parameters and size_t arguments where appropiate

                            Bugfixes:
                            - fixed file seperators for linux
                            - added vdir creation of ui/ldl
                            - fixed incorrect vtable initialization for static MapGrid members for gcc
                            - always include compiled in X11 standard font paths in BitmapFontSearchPath
                            - use c3files_close after c3files_open in c3files.cpp
                            - always opened /dev/cdrom on linux instead of SDL_CDName()
                            - now trailing spaces of volumename get truncated on linux
                            - wrong cd may be determined if multiple cd drives exist and !_BFR_ build
                            - completed SDL-based legal cd check (+1 increment on tracklength needed)
                            - fixed cd path for linux
                            - fixed ZMS/ZFS support for linux in prjfile.cpp
                            - fixed geometric.la target for linux
                            - fixed mapplugin loader for linux
                            - fixed loading of TTF fonts
                            - added initialization of parent class in C3Blitter
                            - fixed method use of uninitiated templates for amd64 gcc

                            Changes merged by Johannes Sixt:
                            - added SDL_QUIT event
                            - optimized aui_BitmapFont a bit
                            - assertion in unimplemented aui_Font
                            - added black ChromaKey for mouse cursor
                            - bugfix: use native surfaces within aui_Mouse
                            - assertion in aui_Pixel for 8bit modes
                            - bugfix: mark aui_Win as registered
                            - no use of assembler blits in C3Blitter for SDL code
                            - added image loading code for targa file formats, assert for others
                            - assertions in aui_SDLUI::AltTab*()


                            Notes:
                            - copy Setup/data/Add/ctp2_program/ctp/texture.dat to the directory
                            where the executable you run is located

                            Comment


                            • #74
                              Revision 429

                              Added a National Manager button to the City Manager.
                              modified ctp2_code/ui/interface/citywindow.cpp
                              modified ctp2_code/ui/interface/citywindow.h

                              Added a National Manager button to the Build Manager.
                              Made Build Manager window non-modal.
                              modified ctp2_code/ui/interface/EditQueue.cpp
                              modified ctp2_code/ui/interface/EditQueue.h

                              Added City Manager button to the National Manager.
                              National Manager window gets focus when open and another window is open.
                              modified ctp2_code/ui/interface/NationalManagementDialog.cpp
                              modified ctp2_code/ui/interface/NationalManagementDialog.h

                              Modified layout files for the new buttons:
                              modified ctp2_data/english/uidata/layouts/citystatus.ldl
                              modified ctp2_data/english/uidata/layouts/citywindow.ldl
                              added ctp2_data/english/uidata/layouts/editqueue.ldl
                              modified ctp2_data/french/uidata/layouts/citystatus.ldl
                              added ctp2_data/french/uidata/layouts/citywindow.ldl
                              added ctp2_data/french/uidata/layouts/editqueue.ldl
                              modified ctp2_data/german/uidata/layouts/citystatus.ldl
                              modified ctp2_data/german/uidata/layouts/citywindow.ldl
                              modified ctp2_data/german/uidata/layouts/editqueue.ldl
                              modified ctp2_data/italian/uidata/layouts/citystatus.ldl
                              modified ctp2_data/italian/uidata/layouts/citywindow.ldl
                              modified ctp2_data/italian/uidata/layouts/editqueue.ldl
                              modified ctp2_data/japanese/uidata/layouts/citystatus.ldl
                              modified ctp2_data/japanese/uidata/layouts/citywindow.ldl
                              added ctp2_data/japanese/uidata/layouts/editqueue.ldl
                              modified ctp2_data/spanish/uidata/layouts/citystatus.ldl
                              modified ctp2_data/spanish/uidata/layouts/citywindow.ldl
                              modified ctp2_data/spanish/uidata/layouts/editqueue.ldl
                              Civ2 military advisor: "No complaints, Sir!"

                              Comment


                              • #75
                                Revision 430
                                Changed paths:
                                M /branches/linux

                                r2445@linux3: holger | 2005-07-24 21:30:45 +0200
                                Merged /trunk from Revision 408 to 429 to /branches/linux:
                                r408@ctp2.kaan.dk: Fromafar | 2005-07-01 18:10:02 +0200
                                r413@ctp2.kaan.dk: Fromafar | 2005-07-04 21:13:08 +0200
                                r416@ctp2.kaan.dk: Fromafar | 2005-07-13 22:52:53 +0200
                                r418@ctp2.kaan.dk: Martin Gühmann | 2005-07-16 20:40:05 +0200
                                r420@ctp2.kaan.dk: Martin Gühmann | 2005-07-18 19:40:16 +0200
                                r422@ctp2.kaan.dk: Martin Gühmann | 2005-07-19 23:19:03 +0200
                                r426@ctp2.kaan.dk: Martin Gühmann | 2005-07-23 16:56:52 +0200
                                r429@ctp2.kaan.dk: Martin Gühmann | 2005-07-24 19:46:26 +0200

                                Revision 431
                                Changed paths:
                                M /branches/linux/ctp2_code/gs/database/profileDB.h
                                M /branches/linux/ctp2_code/gs/gameobj/Strengths.h

                                r2446@linux3: holger | 2005-07-24 23:01:17 +0200
                                Small compile fix to the merge:
                                - Fixed include headers again

                                Comment

                                Working...
                                X