Commit Graph

168 Commits (bab30cef739ce38276472de3f451a9ce0e550e1c)

Author SHA1 Message Date
Angus Lees bab30cef73 Fix include path (not that ivis02 actually compiles or anything..)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@462 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-06 21:30:44 +00:00
Angus Lees 533a4ba5b6 Define correct DEFAULT_DATADIR variable
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@461 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-06 21:28:37 +00:00
Angus Lees 2065bb794f Add Debian packaging files.
Debian packages can be built with a command like:
 dpkg-buildpackage -rfakeroot -b -uc

Any 'official' .deb release should update debian/changelog before
building (particularly the version number).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@460 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-06 21:26:45 +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 22aa133fca Fixed bug#5883 where Flex or Bison could be not installed without warzone complaining about it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@457 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-04 22:21:04 +00:00
Dennis Schridde 8160a01327 Nothing new, just fixes for last patch.
- Resolved a name conflict of SearchPath on Windows
- Cleaned up debugging messages
- Fixed illegal loading of empty path (root element of searchPathRegistry) (caused a bunch of indent changes)
- Always make WriteDir first entry in searchPath
- Fixed WZ_WRITEDIR for Windows

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@456 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-04 15:42:24 +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 6a96159075 - Again revised the way data paths are searched. See CHANGELOG for details.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@454 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-03 22:00:05 +00:00
Dennis Schridde 1e7967c6e4 Update with latest changes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@453 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-03 19:46:56 +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 010af46277 - Again a new point added (Got the idea when closing BRs ;) )
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@449 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-30 22:35:23 +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 357c07374f - Added Ben Russons nickname
- Fixed configure.ac which was requiring AutoConf 2.60 due to an autoupdate

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@447 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-30 15:37:31 +00:00
Dennis Schridde 3453f55bb0 - Updated TODO (user request)
- Added MSVC project, resource and icon file

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@446 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-29 17:55:13 +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 efbe0441c1 Fixed broken data/*.wz creation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@444 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-22 14:30:56 +00:00
Dennis Schridde c9407f3059 Log netplay.log to the writedir instead of working dir.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@443 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-21 17:15:18 +00:00
Dennis Schridde 37ccc21206 Fix a typo
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@442 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-21 16:02:56 +00:00
Dennis Schridde 03386361bb Readd a workaround for broken PhysFS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@441 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-21 15:34:26 +00:00
Dennis Schridde ed5fb5102a Correct unnecessary ALut dependancy and merely rewrote the file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@440 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-21 10:46:56 +00:00
Dennis Schridde 9c8165d360 Fix a missing '\0' which could prevent correct datadir recognition.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@439 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-21 10:00:06 +00:00
Dennis Schridde ddd78550e9 Fixing data/Makefile.am, which broke during resolving conflicts
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@438 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-16 21:33:37 +00:00
Dennis Schridde 55ab0d8a3b Fixed mp.wz creation.
Thanks to imidiate bugreport by Jocke.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@437 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-16 21:11:20 +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 61c48ae09e Fix for outdated Makefile.am after merging 0x patches into mp directory
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@435 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-11 22:35:16 +00:00
Dennis Schridde 47e9adc2ff Remove all unused patch folders.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@434 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-10 15:12:14 +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
Dennis Schridde 5175535d9d Full pathname includes
Same as in r431, but now for lib/
- converted the sources in lib/ to use full path includes instead of just the filename.
- marked places where lib/ivis_*implementation* (eg opengl) is needed, because of incomplete lib/ivis_common.

Should improve the understanding of interfaces and code organization.

(Also fixed a double slash (//) include in src/multimenu.c)



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@432 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-02 19:34:58 +00:00
Dennis Schridde 27fadd14cf - converted the sources in src/ to use full path includes instead of just the filename.
- marked places where lib/ivis_*implementation* (eg opengl) is needed, because of incomplete lib/ivis_common.

Should improve the understanding of interfaces and code organization.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@431 4a71c877-e1ca-e34f-864e-861f7616d084
2006-05-27 16:37:17 +00:00
Dennis Schridde f0f3709178 cleaned the buildfiles a bit up:
- removed Gentoo fix from autogen.sh as it doesn't seem to be needed anymore
- converted "ugly hack"(tm) to a .Phony target in src/Makefile.am

changed version and revision retrieval of Warzone (displayed in the mainmenu):
- Before:
    #define SVN_REVISION "..."
    - defined in src/revision.h, included and used in src/frontend.c
- Now:
    const char * version(); and const char * revision();
    - declared in src/version.h, defined in src/version.c, called in src/frontend.c



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@430 4a71c877-e1ca-e34f-864e-861f7616d084
2006-05-27 16:31:35 +00:00
Per Inge Mathisen 6b4479fe08 Increase the maximum limit of polygons and vertexes for pie files from
256 to 512 as requested by Grim. I hope this is sufficient. Not tested.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@429 4a71c877-e1ca-e34f-864e-861f7616d084
2006-05-20 17:49:19 +00:00
Dennis Schridde dac683d9e1 Added a TODO file, listing bugs which are easy to fix.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@428 4a71c877-e1ca-e34f-864e-861f7616d084
2006-05-19 21:12:04 +00:00
Rodolphe Suescun 52c8e10ea4 Added event CALL_VIDEO_QUIT at end of intel map screen.
Should make that damn transport arrive.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@427 4a71c877-e1ca-e34f-864e-861f7616d084
2006-05-10 05:02:58 +00:00
Angus Lees b3522f3596 correct signedness of unused palette size parameter..
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@426 4a71c877-e1ca-e34f-864e-861f7616d084
2006-05-08 16:11:59 +00:00
Angus Lees c0a561cfb1 intelmap.c: Add new "seqtext" display for displaying the subtitles
from videos.  Will do until we get proper video support.
intelmap.c: Temporarily disable the Flic box, since it just loops on
	    noVideo.rpl until we have real video
intelmap.c: Hack displayImmediateMessage again to popup new
	    IntelScreen seqtext display
rpl_reader: Convert to PHYSFS calls
seqdisp.c:  Move "novideo.rpl" squashing to sequence_stub.c
seqdisp.c:  Fix seq_AddTextForVideo() prototype
scriptfuncs.c: Avoid race when winlose video callback needs to be called during		       displayImmediateMessage


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@425 4a71c877-e1ca-e34f-864e-861f7616d084
2006-05-08 15:10:45 +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 e480791b8c Removed the software terrain tile files (they're useless now).
Reverted C1 tileset to the original one. Grim's work will
be available as a mod.
Readded 2 missing textures in the mp directory.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@423 4a71c877-e1ca-e34f-864e-861f7616d084
2006-05-01 06:19:35 +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 e3dedfdce0 - Additional requirements for the AutoPackage.
- Incremented version number for next release.
- Removed creation of autopackage/default.apspec in configure.ac, because it is useless for usuall builds and automatically created by makeinstaller on each run.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@421 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-23 11:02:58 +00:00
Per Inge Mathisen e467933c79 Display scenario intelligence briefings as console messages. They are
often way too fast for users to read, but it is a step in the right
direction. Patch by Angus Lees.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@420 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-20 18:49:51 +00:00
Per Inge Mathisen 67d648a2a2 The research items rotate too quickly, so slow them down to one
full rotation every 2 seconds, independent of frame rate. Patch
by Angus Lees.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@419 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-20 18:43:08 +00:00
Per Inge Mathisen 9bb74458c8 When you load a savegame where two (enemy?) units are adjacent(?) to each other, its
possible to hit a div by zero bug in visibility.c:visibleObject().

Problem occurs when rayCast() calls rayLOSCallback() and the callback exits due to 
(distSq >= tarDist) being true, without ever having executed the following block that 
updates lastD. lastD remains 0 and the divide at the end of visibleObject throws a 
SIGFPE. On any later occasion, the last distance value from the last calculation will be 
reused in this case, which is still bogus but isn't fatal.

The fix is easy, just add "lastD = dist;" before the return in the (distSq >= tarDist) 
case.

Patch by Angus Lees <gus> in bug #5761.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@418 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-12 14:58:40 +00:00
Dennis Schridde 189ca8950f Fix what I just broke... (Wrong includes, due to moved netsupp.h)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@417 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-08 19:32:29 +00:00
Dennis Schridde c9cd177b0d Finished the move from ivis02/v4101_stub.c to ivis02/v4101.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@416 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-08 19:16:21 +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
Dennis Schridde daf32736ad - Remove CD handling code, which is not used anymore.
Patch by Cybersphinx.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@413 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-08 15:58:27 +00:00