Commit Graph

137 Commits (27fadd14cf71f08be1fd223e27826f1dc67bda33)

Author SHA1 Message Date
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
Rodolphe Suescun 8d57e23a73 Fixed problem in addon.lev file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@399 4a71c877-e1ca-e34f-864e-861f7616d084
2006-02-16 19:48:49 +00:00
Dennis Schridde 495f6ebaa6 Slight visual improvement: Made the water on C1 tileset for the hardware-renderer a bit more transparent, so the ground of the lakes is visible a bit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@398 4a71c877-e1ca-e34f-864e-861f7616d084
2006-02-16 18:12:34 +00:00
Rodolphe Suescun 984de8f9c2 Integrated new tileset from grimandmandy.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@397 4a71c877-e1ca-e34f-864e-861f7616d084
2006-02-16 07:32:34 +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
Rodolphe Suescun d72f0cdc02 Fixed data directory problem.
Fixed sound source destruction problem.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@395 4a71c877-e1ca-e34f-864e-861f7616d084
2006-02-11 09:00:20 +00:00
Per Inge Mathisen 398ca55ba0 Add extra sanity checks to soundtrack code. Patch by Scott Balneaves
with slight changes by me. See bug report #5168 for details.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@394 4a71c877-e1ca-e34f-864e-861f7616d084
2006-02-03 22:00:43 +00:00
Christian Vest Hansen a613adfc61 added COMPILE.html
I've listed the dependencies - someone might wanna check that I got everything

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@393 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-23 19:04:20 +00:00
Per Inge Mathisen 22a78c80bc Add helpful comments to command line parsing code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@392 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-22 12:32:20 +00:00
Per Inge Mathisen 865ef8f633 Even more PSX code removed. Will the horror never end?
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@391 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-21 17:53:06 +00:00
Per Inge Mathisen 9aa3edda64 Fix data path problems under Windows created by previous autopackage patch. Make sure we
check for presence of gamedesc.lev before thinking a path is good. Add more data path 
checks, and gracefully drop paths that do not work.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@390 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-21 15:36:20 +00:00
Rodolphe Suescun 62b6055732 Small change in water rendering code (will require changes
in tilesets).
Fixed 2 memory leaks.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@389 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-19 10:09:20 +00:00
Per Inge Mathisen e03c5cc2f5 Comment out two debug logs that were spamming too much for comfort during normal play.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@388 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-17 08:59:47 +00:00
Per Inge Mathisen 45a97f4204 Reinstate patch loading on game start for now, so that people can play without crashing
on building limits menu. This should be fixed properly later. See bug#4968. Reported 
first by dpblnt <dpblnt>. Added FIXME comment.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@387 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-16 18:55:31 +00:00
Per Inge Mathisen 68c879d8de Make "Warning: Using colour depth of 32 instead of 24." message a debug log message
instead of a printf. Requested by Christian Vest Hansen <karmazilla@gmail.com> in 
bug#4979.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@386 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-16 18:51:12 +00:00
Per Inge Mathisen 5b6b5ecf78 Add more info to command line option -help, patch by Christian Vest Hansen
<karmazilla@gmail.com>.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@385 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-16 18:48:03 +00:00
Per Inge Mathisen 161dbd2e2a Fix transparency issue that made buttons become empty of its icon on mouseover. Error
crept in during PCX -> PNG conversion.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@384 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-16 18:44:08 +00:00
Dennis Schridde a166a71cc9 Commandline options changed:
-datapath is now named -datadir to match the internal variables again.
        Added -help to show all possible command line options.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@383 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-15 12:43:16 +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