Commit Graph

155 Commits (010af46277e2d2e7a96588ade3fee18c8f986524)

Author SHA1 Message Date
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
Dennis Schridde 628a06067b lib/ivis_opengl/screen.c:
- G++ fix( PHYSFS_file ).

other:
 - Simplify sound code.
 - Make Warzone run with busy audio device (Linux).

All patches by cybersphinx.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@412 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-01 17:50:19 +00:00
Rodolphe Suescun 045755e9a3 Minor changes in menus (new audio config menu).
Prepared mod stuff.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@411 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-27 19:53:36 +00:00
Rodolphe Suescun e82eebdf07 Merged all (useless, wicked) patches into data/mp directory.
Fixed button highlight problem in the map selection GUI (was
a very funny bug :) ).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@410 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-27 11:03:10 +00:00
Dennis Schridde 5caab5b3ff More fixes for autopackage, big thanks to Mike Hearn:
- Link libmad statically, as it is not provided in some distros.
- Automatically download physfs if not present.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@409 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-26 14:35:37 +00:00
Rodolphe Suescun 2b5a1f7639 Small fix for compilation under ubuntu...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@408 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-19 07:53:58 +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
Dennis Schridde 01665a8ed6 - Removed autopackage/packages to increase update speed and because 1.1 seems to cause problems on systems with 1.0 installed.
Instead added a README with instructions what to do to build a package.
- Fixed a small typo in package specs.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@405 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-17 12:25:55 +00:00
Per Inge Mathisen 1fc13aa748 Fix autoconf 'make install' which was installing in one 'warzone' directory too deep.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@404 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-11 16:34:18 +00:00
Dennis Schridde 06966cc158 Quick crashfix for Windows, regarding datadir recognition.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@403 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-05 14:29:32 +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
Rodolphe Suescun aa3c7b4ff7 Added shadows as an option.
Alt-S (can be modified) to toggle.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@401 4a71c877-e1ca-e34f-864e-861f7616d084
2006-02-28 14:04:59 +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