Commit Graph

604 Commits (da3c28efa2f85181d4fa39fe595015d312972b42)

Author SHA1 Message Date
Dennis Schridde 95442679bf Dont buffer the --debugfile
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@628 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-25 13:20:57 +00:00
Dennis Schridde e52dba36cc Corrected false error messages, old printfs
netplay.c got a bunch of new LOG_NET debug()s whose effects on performance have not been tested


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@619 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-23 15:27:20 +00:00
Dennis Schridde 62f76a1adf - Fix a deprecated warning on MSVC
- Make MinGW actually compile (it defines __MINGW32__ and not __MINGW__)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@614 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-23 13:01:17 +00:00
Dennis Schridde 0e288f45e7 - Replace all ASSERT(( )) with ASSERT( )
- Simplify definition of ASSERT(). Now is the same for GCC and MSVC.
  This may not work on versions older than MSVC 2005. If you experience this, please report it!

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@613 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-23 12:58:48 +00:00
Dennis Schridde ed62f97175 debug.c: Add callback to output to a win32 debugger. (Registered in main.c)
frame.h: Sync MAX_PATH with windef.h and require IE5 for SHGetFolderPath
types.h: Use stdint.h on MinGW and use __int* types on MSVC
lib/netplay/: Remove empty files
main.c: Use "Documents and Settings\Username\My Documents\Warzone 2.0" (in local lang) as writedir on Windows

Fix double definitions in last commit.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@612 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-23 12:19:17 +00:00
Dennis Schridde f4d639b8e4 Cleanup redefinitions of inline and strcasecmp on MSVC
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@611 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-22 23:32:18 +00:00
Dennis Schridde 62ae49b0ce Replaced all occurences of DBMB, DBPRINTF and DBERROR with their former define.
( DBPRINTF(("Message")); becomes debug( LOG_NEVER, "Message" ); )



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@608 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-22 14:28:49 +00:00
Dennis Schridde c78526b67c New debugging system.
You can now register any callback function to the debug facility.
You will then recieve every preprocessed debug string for which part debugging was enabled.
Offers the possibility to output debugging info to any medium you can think of.

See debug_callback_stderr and debug_callback_file* for an example.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@604 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-21 21:27:12 +00:00
Dennis Schridde c27e649a8a Fix last commit for Linux/GCC
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@601 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-21 16:49:32 +00:00
Roman C 8447972580 Added new scripting functions, cleaned up flex debug output
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@600 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-21 15:33:49 +00:00
Dennis Schridde a026b6118d Make both MSVC and GCC use a very similar define for ASSERT.
I am afraid that I reverted the changes made by Per. Will try to recover them tomorrow.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@590 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-19 22:45:58 +00:00
Dennis Schridde 3210bebd6b - configure.ac, configure.mk: Define NDEBUG for non debug builds (disables assert())
- mem.c: Beautify memFree ASSERT(())


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@589 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-19 22:24:07 +00:00
Per Inge Mathisen 32dc6ada48 Add debug logging and asserts for MSVC use similar to what we have on
the unixy side.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@587 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-19 18:56:03 +00:00
Roman C a891af6a7a git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@570 4a71c877-e1ca-e34f-864e-861f7616d084 2006-08-15 18:38:51 +00:00
Per Inge Mathisen 6d8b190950 Make SBYTE explicitly a signed char, not just a char. This would have broken
some things on platforms where 'just char' means unsigned char. Fix lots of
new signedness warnings resulting from that fix (which would have cropped
up on unsigned char platforms anyway). Also implement a small subset of
stdint.h for windows platform in frame.h, hope this does not create any
conflicts. This allows us to use types like uint64_t where relevant.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@569 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-15 18:20:36 +00:00
Per Inge Mathisen 91e864b3a5 Fix some more warnings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@565 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-12 17:36:22 +00:00
Per Inge Mathisen 2149739999 Almost all strings and buffers are now of type char. This fixes
more than half the warnings on gcc4, and makes sure we do not
get signedness problems between platforms where char is defined
with different signedness. Also set line-ending properites for
some bison/flex files that did not have it set.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@563 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-12 16:52:37 +00:00
Per Inge Mathisen 302967bd69 Fix a ton of warnings with a simple three line change
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@559 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-12 11:39:01 +00:00
Per Inge Mathisen 65175a10ca Add support for MacOSX and big endian platforms. Patch by
iamtheari@gmail.com with changes by me.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@558 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-12 10:45:49 +00:00
Roman C 223ea92358 Scripting Engine Update:
-added simple function support

Limitations:
-void return type only
-no arguments support

Example:
function void myFunc() {<code>}

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@557 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-12 10:02:59 +00:00
Per Inge Mathisen ecb223924a Remove DirectX types
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@553 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-10 16:05:52 +00:00
Per Inge Mathisen a3df2ad6c8 Another force fix. Remove more references to DirectX.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@552 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-10 13:53:26 +00:00
Dennis Schridde 06a5c55cc3 Move cursors.c to cursors.h so I don't try to accidently compile it again.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@546 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-07 00:52:01 +00:00
Dennis Schridde bdd91a32d2 Revised ASSERT()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@536 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-05 18:05:11 +00:00
Per Inge Mathisen 2386a3e924 Reduce amount of memory debug log spam. Turn some into debug() calls. Make ASSERT()
really assert() when in debug mode.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@528 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-05 13:16:12 +00:00
Dennis Schridde af9f7f89f5 - debug.h: Let Warzone output ASSERT as debug( LOG_ERROR )
- block.c: Fix some malicious conversion from pointer to int


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@522 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-04 19:42:56 +00:00
Per Inge Mathisen 31fe5565aa Fix assertion in mouse code. We checked for mouse values that
only worked pre-SDL-porting.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@521 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-04 18:11:44 +00:00
Dennis Schridde bb4b7e82b6 - Update versioninfo in configure.ac and warzone.rc
- Cosmetic change in debug.c (Mark begin of the log with "---")
- Fix bug where PhysFS said WriteDir "Warzone-2.0\" is insecure and refused to create it (bug#6466)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@510 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-31 17:02:45 +00:00
Dennis Schridde 83046470f2 - Updated CHANGELOG
- Makefile.raw doesn't try to link every .o to GL on Linux anymore
- Fixed PhysicsFS ignorecase to not create a Doxygen mainpage


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@509 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-30 15:58:59 +00:00
Dennis Schridde 3116f462fc New Makefile.raw system, works with MinGW/Windows environment and Linux also.
Uses a config.mk.tmpl file to set system dependend stuff, no bash required.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@490 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-21 21:48:55 +00:00
Dennis Schridde 941da64be3 - Document -mod enabling in -help
- Change framerate to 60


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@467 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-08 20:38:00 +00:00
Dennis Schridde f8c1cf3f7d - Fix searchpath priorities
- Also tried to fix memleaks


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@464 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-07 14:08:48 +00:00
Dennis Schridde db7b3190db - Fix the Makefile.am for SDL_framerate.c
- Fix a doubled dirSeparator in subdirs
- Fix accidential DLL creation on MSVC

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@459 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-05 22:19:23 +00:00
Dennis Schridde e9e58f3664 - Limit the framerate to 30 fps. Easily imported functionality from SDL_gfx project (http://www.ferzkopp.net/Software/SDL_gfx-2.0/).
- Fixed previous patch yet again.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@458 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-05 20:39:13 +00:00
Dennis Schridde eb7ba7e41d - Again revised the modloading(restrictions were stupid) (src/levels.c,src/init.[ch],src/multiint.c,src/main.c)
- Fixed case problem with noVideo.rpl (lib/sequence/sequence_stub.c)
- Fixed some G++ 4.1 compile problems (mostly invalid conversions) (lib/script/script_parser.y,lib/framework/frame.h,lib/framework/frameresource.c,lib/framework/frameresource.h,lib/framework/input.c,lib/framework/configfile.c,lib/framework/frame.c)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@455 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-04 13:35:01 +00:00
Dennis Schridde 1b1a695684 - Fixed a HEAP error (Invalid Address specified to RtlFreeHeap) on Windows (MSVC compile) (src/data.c)
- Pointed out other locations where that error could occur (src/data.c, lib/ivis_common/pcx.c)
- Deprecated pie_ReloadTexPage, as it doesn't appear to be used (lib/ivis_opengl/tex.c)
- Made iSprite width and heigth unsigned (lib/ivis_common/pietypes.h)
- Added debugging for MSVC which doesn't understand the DB* redefines (lib/ivis_common/bitimage.c)
- Fixed deprecation for MSVC (lib/framework/macros.h

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@452 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-03 19:43:12 +00:00
Dennis Schridde 8627f307cc - Fixed crash due to freeing 2 times.
- Cleaned up unneeded frees from last memleak fix.
- Added debug info as allways.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@451 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-03 16:24:32 +00:00
Dennis Schridde ee8d18ef48 - Big memleak fixed
- DB* replaced by debug calls
- Added MSVCRT debugging flags for finding memleaks
- Added points to the TODO

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@450 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-01 19:11:05 +00:00
Dennis Schridde a0a006fb12 - Updated TODO with lots of things need to be done
- Fixed a redefinition when using MSVC

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@448 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-30 19:25:05 +00:00
Dennis Schridde ad2abfa53f Updates and debugging style change
- Updated m4 scripts and configure.ac
- Updated AUTHORS and CHANGELOG
- Output debug part in debug mode ("part: debug message")


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@445 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-29 11:27:14 +00:00
Dennis Schridde 194026f379 Rewritten mod loading
This patch includes:
- Strongly modified way of adding mods, maps and addons
- Make nearly everything use PhysFS (just netlog and debug stay)
- Convert several DBERRORs etc. to debug()

The new modloader works like this:
For every mod supplied on the commandline ("-mod") (maximum of MAX_MODS=100) keep it in mind (char * global_mods[]).
After initializing PhysFS do scanDataDirs(), which tries to register all possible paths, global_mods[] and maps with PhysFS. Dont check wether we succeed, only at the very end check if we got a "gamedesc.lev".

When we buildMapList(), mark "gamedesc.lev" as MOD_CAMPAIGN, "addon.lev" and every user supplied map as MOD_MULTIPLAY.

When we loadMods() modify the searchPath according to the supplied mods.
Note: T1 maps like Sk-Rush come from gamedesc.lev, are marked MOD_CAMPAIGN and thus wont load any multiplay_mods[], even if the user starts a multplayer game. Instead those maps are threated as campaignmode and will only load campaign_mods[].

This patch requires the "mp" patches to be either in ProgramDir/mp, in ProgramDir/data/mp or in ProgramDir/mp.wz
This is because one cannot add warzone.wz/mp to the search path if warzone.wz is an archive.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@436 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-16 19:10:23 +00:00
Dennis Schridde 9b0a31e9b2 Made Warzone compile using MSVC!
- Fixed several files for being C89 compatible, so MSVC compiles them. (No variable declarations after function calls allowed.)
- Added function definitions (lib/framework/win32fixes.h) for functions with different names under Win32/Linux. (Aiming at moving all platform specific defines into such headers. Everywhere included frame.h should make this easy.)
- Please take a look at lib/gamelib/audp_parser.y. I had to convert the lowercase token "text" to uppercase "TEXT", so it doesn't collide with msxml.h (mysteriously included by some windows headers).

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@433 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-03 23:46:03 +00:00
Angus Lees ef21733bf0 fix some simple compile warnings (some of them would be bugs on non-i386)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@424 4a71c877-e1ca-e34f-864e-861f7616d084
2006-05-03 23:10:36 +00:00
Rodolphe Suescun 71c79af87d Added code for modding.
Fixed Makefile.raw stuff.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@422 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-29 07:09:00 +00:00
Dennis Schridde 40090410ac - Cleaned up stubs
- Removed unused/outdated ivis02/Ivis02.dsp/.vcproj and  src/mpdpxtra.[ch]
- Replaced src/mplayer.c with a stub, containing only mplayerSubmit()
- Added DEPRECATED warnings
- Added documentation for WZ_DEPRECATED
One commit follows, to finish the move from ivis02/v4101_stub.c to ivis02/v4101.c



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@415 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-08 19:14:30 +00:00
Dennis Schridde b84d79a576 - Drastically simplyfied mouse-handling.
Patch by Cybersphinx

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@414 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-08 16:13:48 +00:00
Rodolphe Suescun 5d75bf6298 Fixed raw makefiles.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@407 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-19 05:00:32 +00:00
Dennis Schridde fe689a39ec - Cleaned up iVis a bit by "commonalizing" it.
- Added a WZ_DEPRECATED macro (lib/framework/macros.h) to mark deprecated functions.
  (See http://websvn.kde.org/trunk/KDE/kdelibs/kdemacros.h.in?view=markup -> KDE_DEPRECATED for usage.)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@406 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-18 01:59:59 +00:00
Rodolphe Suescun e36796f6ce Made necessary changes so that code can be compiled using g++.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@402 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-01 06:12:28 +00:00
Dennis Schridde 1e7edf9fa2 Fixes some minor memleaks and marks the source of the big one in pie_PNGLoadMem.
Also big amount of whitespace changes, sorry for the inconvenience...



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@400 4a71c877-e1ca-e34f-864e-861f7616d084
2006-02-18 18:54:37 +00:00
Rodolphe Suescun f35669c212 Fixed problem in data patch 05. Maybe all patches should be
merged...
Now filenames are case insensitive (will help using maps
created with Qamly's EditWorld).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@396 4a71c877-e1ca-e34f-864e-861f7616d084
2006-02-15 09:57:55 +00:00
Dennis Schridde d97c39b407 Fixes bug #4961
Thanks for this patch to Scott Balneaves <sbalneav>


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@382 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-15 11:44:13 +00:00
Rodolphe Suescun f780a15b6d Decreased min camera distance (will be useful for artists).
Fixed paths for savegames and screendumps.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@366 4a71c877-e1ca-e34f-864e-861f7616d084
2005-11-30 21:09:38 +00:00
No Author 5ba7ddac6b Create final repository structure.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@362 4a71c877-e1ca-e34f-864e-861f7616d084
2007-06-28 17:47:08 +00:00