Commit Graph

109 Commits (7590ea72a7e021b364669908f3f33b8ba7a43890)

Author SHA1 Message Date
Dennis Schridde bf9d1d0fd1 Fix last commits and remove another bunch of warnings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@886 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-02 14:38:09 +00:00
Dennis Schridde 495824aea2 Patch by Christian Ohm:
018 - Warning fixes in lib-framework


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@885 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-02 13:06:56 +00:00
Dennis Schridde 746a25ba13 Fix last commits by adding LOG_WARNING
Patch by Christian Ohm:
028 - Add LOG_WARNING


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@882 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-02 11:19:48 +00:00
Dennis Schridde 208f0b711b Patch by Christian Ohm:
030 - Better output for loadFile2


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@880 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-02 11:09:36 +00:00
Dennis Schridde c510f87ed7 Patch by Gerard Krol: Removal of debug macros
Changes several DBPx macros to debug() calls and:
I introduced 2 new categories: LOG_MOVEMENT and LOG_ATTACK
and what didn't fit in was set to LOG_NEVER.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@876 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-01 22:22:29 +00:00
Dennis Schridde 526cd5482f Patches by Christian Ohm:
013 - Cleanup environ.c-h
015 - Remove some unused code from frame.c-h
017 - Remove unused function ScanFilename()
023 - Fix more warnings, remove unnecessary functions


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@865 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-26 11:58:01 +00:00
Roman C 9b7ab89441 Fixed MSVC related issues
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@855 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-25 16:49:32 +00:00
Dennis Schridde fafa69842f x86_64 fixes by Pseudonym404. (Incl. some minor other changes, eg in src/game.c)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@854 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-25 01:26:05 +00:00
Stefan Huehner da14eaf2ad Add some more const to char* function parameters,
which aren't modified inside the called function.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@853 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-23 13:28:38 +00:00
Roman C a7e6ef3b23 Fixed some compiler and linker warnings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@849 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-18 13:19:56 +00:00
Roman C 6d8dbda48e -fixed 'cpPrintProgram'
-fixed some spelling mistakes
-minor cleanups

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@847 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-17 11:25:03 +00:00
Roman C dacc1de1ca Scripting engine overhaul - Part I
-compiler and parts of interpreter now use union to store different data types
-got rid of a great deal of pointer->integer casts

-ASSERT() now outputs last event (or function) called by scripts
-implemented float data type support for the scripting engine - basic functionality at the moment

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@846 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-16 14:30:29 +00:00
Dennis Schridde fb74a1f8dc Patch by Thomas Rast: Include string.h against warnings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@821 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-06 14:40:07 +00:00
Dennis Schridde 770af57c20 Remove more extra types
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@812 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-04 23:16:51 +00:00
Dennis Schridde b1c7773299 Patches by Charon, slightly modified:
- *WarzoneKeyNumeric definition changed to SDWORD
- Report wrong tracknumbers to LOG_SOUND and don't crash in sound_Play*DTrack
- Correct --help text
- Make console backlog key configurable


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@810 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-04 21:05:31 +00:00
Dennis Schridde 67056c8d24 - Droped a lot of (nearly) unused types from lib/framework/types.h
- Remove lots of unused functions (Windows/DDraw related)
- Now store the used bitdepth in the config and thus make it configurable without having to modify the sourcecode


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@808 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-04 01:11:26 +00:00
Dennis Schridde d3cd44148d Patch by Gerard Krol: Replace STRING with char (STRING was confusingly defined to char)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@804 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-03 21:35:50 +00:00
Roman C 727ed6641c Patch by Gerard Krol: warnings changes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@801 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-02 19:33:46 +00:00
Dennis Schridde 39ff5cc515 Make lots of __inline, _inline, FUNCINLINE and whatnot static inline. See bug#7591.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@798 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-31 20:22:01 +00:00
Roman C 9be9d21e09 -automatic target assignment will now give low priority to half-built structures when looking for a target (structures getting full HP upon construction begin was an exploit against unit AI)
-fixed line endings in macro.h
-applied Christian Ohm's "032 - Fixes for src-aiexperience.c-h" and "037 - g++ fix" patches
-made warzone report loading of all *.lev files

Scripting:
-fixed implicit bool/int to string convertion for the scripting language
-STRUCTURESTAT can now be checked for being 0 with NULLSTRUCTURESTAT
-minor scripting function fixes

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@794 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-24 13:05:40 +00:00
Dennis Schridde b8bdd4d562 Patch by Christian Ohm: Process SDL_QUIT
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@785 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-09 19:00:20 +00:00
Roman C e2de834b13 -1.10 AI doesn't build flamer bunkers in the base anymore
-It is now possible to win in a team in 'Locked Alliances' mode, also in this mode a player doesn't lose until all of his team members were defeated
-Game now shows a text message when player has won/lost the game (just a temporary solution to bug #7317)
-Added extra heap debug, should be there at least until we fix bug #6530, as PTRVALID() doesn't seem to detect corrupted DROID pointers on win
-Increased number of iterations A* is allowed to do per frame, which will hopefully speed up pathfinding
-Fixed multiplayer menu slider bug (bug #6529)
-Fixed players not forwarding enemy units visibility to their allies in 'TEAMPLAY' and 'Locked Alliances' modes
-Further scripting engine improvements

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@780 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-08 08:06:46 +00:00
Dennis Schridde 49a56a27e4 Fix r777: Allways display an error message (with an actual errormessage instead of just a string address) and never display it twice (not even in NDEBUG builds).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@779 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-08 00:54:23 +00:00
Dennis Schridde 759a6f5d02 Fix for r776.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@778 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-08 00:05:24 +00:00
Dennis Schridde d163be853d Christian Ohm's PSX removal part 1.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@777 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-07 16:40:18 +00:00
Dennis Schridde 4ea12897a5 - Replaced all filenames (I could find) with their lowercase and platform independed notation. There might be some uppercase filenames left in the sourcecode.
- Because savegame filenames are converted to lowercase old savegames won't work anymore. You can simply fix that by renaming them to lowercase.
- All unix_path, unix_fopen and PHYSFSEXT_locateCorectCase functions and calls to them have been removed. (So you _will_ notice when a file is not found, at least on Unix systems.)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@776 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-07 14:13:47 +00:00
Roman C 9aaae50baa Replaced 'Humans vs AIs' with 'Locked Teams' alliance mode.
Fixed difficulty slider applying settings to the wrong players.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@763 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-26 18:14:05 +00:00
Dennis Schridde 37afd5d1c4 Use platform.h instead of direct includes.
The whole system has to be tuned further but this shows the direction.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@762 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-25 22:04:35 +00:00
Roman C 30faef0ce8 Temporary MSVC fix to r749
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@761 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-25 20:14:55 +00:00
Stefan Huehner 532ada3156 Add doxygen style headers to .h files to document
their meaning.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@759 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-25 16:46:28 +00:00
Stefan Huehner 30f6dc392e mark some Strings an read-only by adding const.
On the way replace STRING with char



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@756 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-24 19:11:34 +00:00
Stefan Huehner 567fc10e50 Include missing input.h in frame.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@751 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 18:40:07 +00:00
Stefan Huehner b3e3d17b82 Include frameresource.h directly in its users. Fixup after
the big cleanup in 748:749.




git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@750 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 18:38:12 +00:00
Dennis Schridde 3261a09baf BIG cleanup of headers.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@749 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 17:24:55 +00:00
Dennis Schridde 912cf2c8e2 Partially revert r739.
SDL < 1.2.10 doesn't define the string function wrappers.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@747 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 14:56:18 +00:00
Dennis Schridde d39f787caf - Enforce floats in several places
- Define WORD and BYTE types to SDL types
- Let SDL handle some more of the win32fixes


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@739 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-20 19:46:33 +00:00
Stefan Huehner 1395a7c69c Make some more functions static which aren't used outside their
declaring source files and which have no prototype.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@731 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-19 18:45:48 +00:00
Dennis Schridde d889ce9da7 Patch by Christian Ohm: "g++ fixes"
Mainly explicit casts, some type changes, a few fixes.

We need to have a look if this line creates any problems:
lib/script/interp.c @@ -329,7 +329,7 @@
- if(!RetStackRemember(CurEvent, (ip + 2)))       //Remember where to jump back later
+ if(!RetStackRemember(CurEvent, *(ip + 2)))      //Remember where to jump back later


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@719 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-17 20:39:25 +00:00
Dennis Schridde 75af155bbf Patches by Stefan Huehner: "code cleanup: void 5, static 4" and a slightly modified "doxy 1"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@717 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-16 17:41:40 +00:00
Dennis Schridde a88bbc0c37 Patch by Stefan Huehner: "string 1"
Replace all STRING with char or const char.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@716 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-16 16:02:17 +00:00
Dennis Schridde 27b07a0ba1 Patch by Stefan Huehner: "code cleanup: const 2"
Patch marks several read-only function parameters and datastructures as such by adding const.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@709 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-13 21:16:17 +00:00
Dennis Schridde b9087ef4ca Patch by Stefan Huehner: "code cleanup: void 4"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@706 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-13 21:11:11 +00:00
Dennis Schridde 728b9a9913 - Commit patches "code cleanup: void" and "code cleanup: const" by Stefan Huehner
- Replace every occurence of VOID with void (and LPVOID with void*)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@703 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-13 09:09:05 +00:00
Dennis Schridde fe1a94f6dc - Mark possibly breaking assignments
- Don't declare stdint declarations which are allready declared in SDL_config
- Change only use of stdint type to use SDL type instead

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@700 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-08 20:05:38 +00:00
Dennis Schridde 78be6bc2bc Fix double to float assignments by forcing fixed numbers to float.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@698 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-08 20:02:49 +00:00
Dennis Schridde 93389e9d3f Include frame.h into .y files using free and malloc, so they get the redefinitions needed for msvcrt malloc debugging.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@696 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-08 19:59:00 +00:00
Dennis Schridde 6094ea9bbf Fix ASSERT() to be standards compliant and compile with g++.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@684 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 20:30:46 +00:00
Dennis Schridde 1607f7e194 - --(no)sound toggles sound initialization (to explicitly disable sound)
- --(no)shadows toggles shadows (instead of --shadows yes/no)
- Removed unused functions from warzoneconfig


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@680 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 12:41:55 +00:00
Dennis Schridde 346a73eba8 Comment out a forgotten ex-DBP0 call.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@674 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-31 20:15:29 +00:00
Dennis Schridde 2c460e920b - Remove all references to DBP0()
- Add Irrlicht evaluation to TODO


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@673 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-31 20:14:21 +00:00