Announcement

Collapse
No announcement yet.

PROJECT: Altered source files

Collapse
X
Collapse
 
  • Page of 34
  • Filter
  • Time
  • Show
Clear All
new posts
Previous 1 22 28 29 30 31 32 33 34 template Next
  • #466
    Originally posted by Martin Gühmann


    What be with this revision? Solver used an outdated version of the files. And I didn't add these files into my private version before I merged them per hand. And after that I posted an updated version of these files.
    That was all I wanted to know. I just got confused by the fact Solver's out-of-date patch had been applied.
    Caution! Under no circumstances confuse the mesh with the interleave operator, except under confusing circumstances!
    -Intercal reference manual

    People often remark of me, "You say sorry far to much!". To which my common-sense reply is "I apologise".

    Comment

    • #467
      Implemented Martin's/Nordicus's extra trade goods.

      1) CityData: Add in the food and shields from any trade good in the city's radius.
      2) InfoBar : Show the trade good data from the selected tile.
      3) helptile: ditto.

      Added some comments. This is the first time I've used SVN and I ran up against some conflicts with Martin's last revision. Hope I sorted everything out OK.

      Comment

      • #468
        319 Some minor fixes

        modified ctp2_code/ctp/anet.inf - Activision 1.1 patch
        modified ctp2_code/ctp/bootserv.txt - only server left
        deleted ctp2_code/ctp/eventcb.txt - generated by exe
        deleted ctp2_code/ctp/ldlparselog.txt - generated by exe
        deleted ctp2_code/ctp/slicdbg.txt - generated by exe
        modified ctp2_code/gs/fileio/CivPaths.cpp - memory leak/crash fix, included patterns/pictures
        modified ctp2_code/gs/slic/StringHash.h - memory leak
        modified ctp2_data/default/gamedata/tut2_main.slc - repaired type conflict

        Comment

        • #469
          r321
          Fixed my error in the docs saying that sliccmd.y/l aren't used anymore (Thanks Fromafar!). A few more changes here and there.
          modified dev/ctp2_dev.tex
          modified dev/include/a_deadcode.tex
          modified dev/include/a_file_describe.tex
          modified dev/Makefile
          Caution! Under no circumstances confuse the mesh with the interleave operator, except under confusing circumstances!
          -Intercal reference manual

          People often remark of me, "You say sorry far to much!". To which my common-sense reply is "I apologise".

          Comment

          • #470
            Revision 322

            - Added a new button to cause-and-effect-tab of the Domestic-Manager: Optimize Slider. This button allows you to "optimize" your sliders like the AI would do. Currently it is only usefull for debugging, as the AI can't optimize its sliders.
            - Added a new button to the specialists tab of the City Manage: Optimize Specialists. Thhis one is more useful for the avarage player as the AI can use farmers to prevent the city from starving and can use entertainers to make the city happy.
            -Modified National Manager and Specialists tab of the City Manager so that it now shows net food and net production instead of gross food and gross production. The player can now see how much production is left for build projects and how much food is left for city growth.
            modified ctp2_code/ui/interface/CauseAndEffectTab.cpp
            modified ctp2_code/ui/interface/CauseAndEffectTab.h
            modified ctp2_code/ui/interface/citywindow.cpp
            modified ctp2_code/ui/interface/citywindow.h
            modified ctp2_code/ui/interface/NationalManagementDialog.cpp

            -Added strings for new buttons and moved some other strings from add_str.txt to their final intended positions.
            -Updated the *ldl files for the new buttons as well.
            -Renamed in the German version "Lexikothek" to "Große Bibliothek" that creates more atmospere and is more consistent with the other languages.
            modified ctp2_data/english/gamedata/add_str.txt
            modified ctp2_data/english/gamedata/civ_str.txt
            modified ctp2_data/english/gamedata/gl_str.txt
            modified ctp2_data/english/gamedata/ldl_str.txt
            modified ctp2_data/english/gamedata/tips_str.txt
            added ctp2_data/english/uidata/layouts/citywindow.ldl
            added ctp2_data/english/uidata/layouts/civstatus.ldl
            added ctp2_data/english/uidata/layouts/ctp_template.ldl
            modified ctp2_data/french/gamedata/add_str.txt
            modified ctp2_data/french/gamedata/civ_str.txt
            modified ctp2_data/french/gamedata/gl_str.txt
            modified ctp2_data/french/gamedata/ldl_str.txt
            modified ctp2_data/french/gamedata/tips_str.txt
            modified ctp2_data/french/uidata/layouts/civstatus.ldl
            modified ctp2_data/german/gamedata/add_str.txt
            modified ctp2_data/german/gamedata/civ_str.txt
            modified ctp2_data/german/gamedata/gl_str.txt
            modified ctp2_data/german/gamedata/Great_Library.txt
            modified ctp2_data/german/gamedata/ldl_str.txt
            modified ctp2_data/german/gamedata/tips_str.txt
            modified ctp2_data/german/gamedata/tut2_str.txt
            added ctp2_data/german/uidata/layouts/citywindow.ldl
            modified ctp2_data/german/uidata/layouts/civstatus.ldl
            added ctp2_data/german/uidata/layouts/ctp_template.ldl
            modified ctp2_data/italian/gamedata/add_str.txt
            modified ctp2_data/italian/gamedata/civ_str.txt
            modified ctp2_data/italian/gamedata/gl_str.txt
            modified ctp2_data/italian/gamedata/ldl_str.txt
            modified ctp2_data/italian/gamedata/tips_str.txt
            modified ctp2_data/italian/uidata/layouts/citywindow.ldl
            modified ctp2_data/italian/uidata/layouts/civstatus.ldl
            modified ctp2_data/italian/uidata/layouts/ctp_template.ldl
            added ctp2_data/japanese/uidata/layouts/citywindow.ldl
            added ctp2_data/japanese/uidata/layouts/civstatus.ldl
            added ctp2_data/japanese/uidata/layouts/ctp_template.ldl
            modified ctp2_data/spanish/gamedata/add_str.txt
            modified ctp2_data/spanish/gamedata/ldl_str.txt
            modified ctp2_data/spanish/gamedata/tips_str.txt
            added ctp2_data/spanish/uidata/layouts/citywindow.ldl
            modified ctp2_data/spanish/uidata/layouts/civstatus.ldl
            added ctp2_data/spanish/uidata/layouts/ctp_template.ldl
            Civ2 military advisor: "No complaints, Sir!"

            Comment

            • #471
              Revision 323

              Updated gl_str.txt's to match with Peter's latest addition.
              Added all the original text files so that we can see any at least in these text any modifications from future revisions.
              Added missing sound files and sprites from GoodMod.
              However The game won't work together with Peter's version of terrain.txt, since a modified goods.txt is missing and also the Great Library needs an update.
              However this is not the last problem with adding GoodMod, since old saves would be incompatible.

              -Martin
              Civ2 military advisor: "No complaints, Sir!"

              Comment

              • #472
                After several attempts, I think I've committed modified versions of goods.txt and goodsID.txt to the project. I thought I'd added the other files earlier.

                Comment

                • #473
                  Revision 327 Memory leaks repaired

                  modified ctp2_code/gfx/tilesys/TileInfo.cpp
                  modified ctp2_code/gs/events/GameEventHook.cpp
                  modified ctp2_code/gs/gameobj/ArmyData.cpp
                  modified ctp2_code/gs/slic/SlicArray.cpp
                  modified ctp2_code/gs/slic/SlicContext.cpp
                  modified ctp2_code/gs/slic/SlicEngine.cpp
                  modified ctp2_code/gs/slic/SlicFrame.cpp
                  modified ctp2_code/gs/slic/SlicFrame.h
                  modified ctp2_code/gs/slic/StringHash.h
                  modified ctp2_code/gs/world/UnseenCell.cpp
                  modified ctp2_code/gs/world/wldgen.cpp
                  modified ctp2_code/robot/aibackdoor/bit_table.h

                  Comment

                  • #474
                    Revision 328 Mod support

                    modified ctp2_code/gfx/tilesys/tiledraw.cpp - added (DisplayLevel) option to draw on top of roads
                    modified ctp2_code/gs/newdb/terrimprove.cdb - added (DisplayLevel) option to draw on top of roads
                    modified ctp2_code/gs/slic/slicfunc.cpp - improved argument checking
                    modified ctp2_code/ui/interface/controlpanelwindow.cpp - relaxed Assert for Mod debugging

                    Comment

                    • #475
                      Revision 329 Project management

                      deleted anet.inf - unused
                      deleted ctp2_code/ctp/usercritmsgs.txt - generated by the executable
                      deleted Scenarios/AlexanderTheGreat/scen0000/default/gamedata/Const.txt - the original is accepted
                      deleted Scenarios/MagnificentSamurai/scen0000/default/gamedata/Const.txt - the original is accepted

                      Dinkumware STL fixes for MSVC6

                      added ctp2_code/compiler
                      added ctp2_code/compiler/msvc6
                      added ctp2_code/compiler/msvc6/stlfixes
                      added ctp2_code/compiler/msvc6/stlfixes/algorithm
                      added ctp2_code/compiler/msvc6/stlfixes/DEQUE
                      added ctp2_code/compiler/msvc6/stlfixes/FSTREAM
                      added ctp2_code/compiler/msvc6/stlfixes/LIST
                      added ctp2_code/compiler/msvc6/stlfixes/MEMORY
                      added ctp2_code/compiler/msvc6/stlfixes/SSTREAM
                      added ctp2_code/compiler/msvc6/stlfixes/STRING
                      added ctp2_code/compiler/msvc6/stlfixes/VECTOR
                      added ctp2_code/compiler/msvc6/stlfixes/XMEMORY
                      added ctp2_code/compiler/msvc6/stlfixes/XSTRING
                      added ctp2_code/compiler/msvc6/stlfixes/xtree

                      The STL fixes are for MSVC6 users only. To use these, go to menu Tools|Options|Directories, select 'Include files', and insert
                      ...\ctp2_code\compiler\msvc6\stlfixes just before the Visual Studio include directories (but after the DirectX/DirectMedia ones).

                      Comment

                      • #476
                        Revision 330 Standardised list include

                        modified ai/diplomacy/Diplomat.h
                        modified ai/diplomacy/foreigner.cpp
                        deleted ai/list-fixed - moved to compiler/msvc6/stlfixes/list in revision 329
                        modified ai/mapanalysis/settlemap.h
                        modified ai/strategy/scheduler/Plan.h
                        modified ai/strategy/scheduler/scheduler.cpp
                        modified ai/strategy/scheduler/scheduler_types.h
                        modified ctp/ctp2_utils/c3debugstl.h
                        modified gs/gameobj/gaiacontroller.cpp
                        modified gs/gameobj/gaiacontroller.h

                        Comment

                        • #477
                          Originally posted by Fromafar
                          Revision 329 Project management

                          The STL fixes are for MSVC6 users only. To use these, go to menu Tools|Options|Directories, select 'Include files', and insert
                          ...\ctp2_code\compiler\msvc6\stlfixes just before the Visual Studio include directories (but after the DirectX/DirectMedia ones).
                          Could someone remember to put this into the 'How to compile CTP2' PDF
                          ·Circuit·Boi·wannabe·
                          "Evil reptilian kitten-eater from another planet."
                          Call to Power 2 Source Code Project 2005.06.28 Apolyton Edition
                          ▼▼▼▼▼▼

                          Comment

                          • #478
                            Originally posted by Flinx


                            Could someone remember to put this into the 'How to compile CTP2' PDF
                            Done.

                            r331
                            Added information for r329 for building.
                            M doc/dev/include/setup_win32.tex
                            Caution! Under no circumstances confuse the mesh with the interleave operator, except under confusing circumstances!
                            -Intercal reference manual

                            People often remark of me, "You say sorry far to much!". To which my common-sense reply is "I apologise".

                            Comment

                            • #479
                              Revision 332

                              Moved Peter's good's fix to the GetFoodFromTerrain, GetProductionFromTerrain and GetGoldFromTerrain methods from Cell and UnseenCell. This way you don't have to add the good stuff if you use the these methods at other places of the projet, e.g. my governor alterations.
                              modified ctp2_code/gs/gameobj/CityData.cpp
                              modified ctp2_code/gs/world/Cell.cpp
                              modified ctp2_code/gs/world/UnseenCell.cpp
                              modified ctp2_code/ui/aui_ctp2/InfoBar.cpp
                              modified ctp2_code/ui/interface/helptile.cpp

                              Prevented a crash when you switch between Mods and the first mod allowed more civs than the second mod, and the CivIndex was set higher then the total number of civs in the second mod.
                              modified ctp2_code/ctp/civapp.cpp

                              And by the way Peter, next time don't delete files if you are going to readd them anyway. The purpose was to be able to see the differences between the original files and your files.

                              -Martin
                              Civ2 military advisor: "No complaints, Sir!"

                              Comment

                              • #480
                                Revision 333

                                Fixed bug with change government dialog when a new government is discovered so that the government name now appears again and there is no more white text.
                                modified ctp2_code/gs/slic/sliccmd.cpp

                                Modified > operator so that it is now antisymmetrical.
                                modified ctp2_code/ai/strategy/squads/squad_Strength.cpp

                                -Martin
                                Civ2 military advisor: "No complaints, Sir!"

                                Comment

                                Previous 1 22 28 29 30 31 32 33 34 template Next
                                Working...
                                X