Commit Graph

10212 Commits (2242dac95fb1e9ff8c516e35bbe89944280fd807)

Author SHA1 Message Date
Per Inge Mathisen 2ff998ca19 Add configre check for ALut header, and include it if it exists. Also fix one signedness
warning in the openal code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@250 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-16 21:37:51 +00:00
Christian Ohm 603ed27fba - Fix a few warnings.
- Remove the shell command variables from CFLAGS.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@248 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-15 22:46:11 +00:00
Christian Ohm 99d9f6d513 Fixed the GNUmakefile/automake conflict. Invoke normal make build with "Make -f
Makefile.raw".



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@247 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-14 12:54:10 +00:00
Per Inge Mathisen 34c30df060 Fix some warnings, fix an error where a log message used %d where it should use %s.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@246 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-14 11:03:18 +00:00
Per Inge Mathisen 469327f006 Use #undef instead of #define something FALSE for turning defines off, since the latter
is understood by gcc as the opposite of what it was meant for, effectively turning a lot 
of debugging code on, instead of off. There may be other instances of this problem in 
the code.

To reiterate:

#define SOMETHING FALSE
#ifdef SOMETHING
#error This will be executed
#endif


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@245 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-14 11:00:17 +00:00
Christian Ohm 567749415c Rename the Makefiles to GNUmakefile to not collide with the automake generated
Makefiles.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@244 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-13 21:07:08 +00:00
Christian Ohm ce9217bc39 Fix Makefile build.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@243 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-13 21:00:20 +00:00
Per Inge Mathisen 574e62bd5a Update configure build with most recent changes. Pure makefile build
has to be updated separately. (Can someone _please_ rename those 
makefiles?)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@242 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-13 18:49:28 +00:00
Per Inge Mathisen ed77b87a53 bitimage.c, fbf.c, imdload.c and imd.c moved into lib/ivis_common/. All
warnings removed from ivis02, ivis_common and ivis_opengl. STRING set to 
char, not unsigned char; any problems with this should be fixed elsewhere 
in the code - it is the right thing to do. All ENGINE_* except ENGINE_4104 
(SDL) and ENGINE_OPENGL (and ENGINE_UNDEFINED, of course) code removed 
(this made it much simpler to make the code sane wrt the above).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@241 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-13 18:47:28 +00:00
Per Inge Mathisen 4f1ccb7931 Some dead engine code removed. Some warnings killed. Better logging added. Fix for
Makefile.am that solves a potential linking problem with ivis_common. Removed checking 
for binary PIEs, which only existed on PSX.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@240 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-13 18:43:06 +00:00
Per Inge Mathisen abaa4fa350 Remove revision.h (autogenerated file) from revision control, as previously discussed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@239 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-13 18:20:08 +00:00
Christian Ohm cff2cec8d8 Fix Makefile build.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@238 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-08 21:45:04 +00:00
Per Inge Mathisen 15c1f1eb31 Files forgotten in the previous commit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@237 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-08 21:16:32 +00:00
Per Inge Mathisen d01c2360f7 Create lib/ivis_common/ which is code that is shared between software SDL and OpenGL
implementations. Start by sharing all identical header files, and bug.c for proof of 
concept. This breaks pure makefile builds, will try to fix in next commit.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@236 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-08 21:09:37 +00:00
Per Inge Mathisen 1bc281682e Remove unused DirectX check.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@235 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-08 20:39:58 +00:00
Per Inge Mathisen 6ba7942cb8 Remove some dead and unused DirectX code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@234 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-08 18:29:28 +00:00
Per Inge Mathisen e7eead3c7a Remove dead check for DirectX version.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@233 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-08 18:16:17 +00:00
Per Inge Mathisen 26afc339a4 Remove last bit of AMD 3DNow code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@232 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-08 18:13:41 +00:00
Per Inge Mathisen 1c3458fe82 Remove the unused, outdated AMD 3DNow! code. Both SDL and OpenGL support 3DNow.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@231 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-08 18:02:21 +00:00
Victor Qamly dc6d7963c6 Removed unneeded Alut.h include file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@230 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-07 18:50:49 +00:00
Victor Qamly a4f67a427c Adding the correct way to destroy the context according to the openAL SDK docs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@229 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-07 04:39:04 +00:00
Victor Qamly 0dfb589fa0 Fixes for .net compiler, and some other fixes in handling of wrapped variables & NOT wrapped functions that used those variables.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@228 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-06 22:49:15 +00:00
Per Inge Mathisen a9aa16de39 New debug logging code, replacing the old code. Use command line options -debugfile and
-debug to control debugging output. Use debug() instead of printf or DBPRINTF for debug 
information.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@227 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-06 12:29:26 +00:00
Per Inge Mathisen c5ecd8c321 Properly reinitialize network-related variables. This should solve network problems
after the first time trying to connect which are "solved" by quitting and restarting the 
game. Patch by Henri Valta <henri.valta@kemi.fi>.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@226 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-04 12:04:43 +00:00
Per Inge Mathisen bbb9b995db Reenable --enable-debug and make it compile. Patch by Dennis Schridde
<devurandom@gmx.net>.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@225 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-04 11:46:10 +00:00
Per Inge Mathisen 1fb0ececc3 Finally remove annoying printf that I added for debugging, and use safer snprintf to ensure that we never again go overwriting random memory here.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@224 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-03 21:23:01 +00:00
Per Inge Mathisen 3346f67917 Revert previous repository revision number idea, since that could not possibly work. Put the previous work back with some changes to ensure builds are not silently broken when subversion command-line client not present.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@223 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-03 20:55:17 +00:00
Per Inge Mathisen ffec634777 Remove the old revision number hack.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@222 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-03 18:48:53 +00:00
Per Inge Mathisen dcaecafb4d The keyword was case-sensitive...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@221 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-03 18:02:59 +00:00
Per Inge Mathisen c6bec7cd73 Make use of revision.h to find the SVN revision number instead of a "stupid hack" (not my words) in Makefile.am that will only work in some Unix environments with svn command line client properly installed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@220 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-03 18:00:07 +00:00
Per Inge Mathisen 2e02866a1e Set the 'Revision' keyword that tells Subversion to update and expand the $REVISION$ tag.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@219 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-03 17:54:42 +00:00
Per Inge Mathisen 7f74704b2f This header contains a define with the revision number of the repository, updated automatically by Subversion itself.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@218 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-03 17:47:28 +00:00
Per Inge Mathisen cd4d262cbf Reinstate check for alut (needed for autoconf compiles on mingw32 since there alut is a separate library), and only set LIBS for all but mingw32 after doing all checks, so that error reporting during autoconf runs becomes correct.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@217 4a71c877-e1ca-e34f-864e-861f7616d084
2005-08-03 09:46:25 +00:00
Christian Ohm 8db3abcd2e Remove -Wno-pointer-sign from CFLAGS. Sorry, I wasn't aware that's gcc 4 only.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@216 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-29 22:26:00 +00:00
Per Inge Mathisen 30dc376b1f Remove check for ALUT, add check for libjpeg.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@215 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-28 13:39:11 +00:00
Per Inge Mathisen 41dbf05e4b frame.h must be included before config.h defines can be used.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@214 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-28 13:33:43 +00:00
Denis Dupeyron 86d8541521 Relase date corrected. It will be done in a few hours, which is tomorrow.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@213 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-27 16:14:09 +00:00
Denis Dupeyron 6a82c6b835 Preparing release 2.0 beta 0.2.2.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@212 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-27 16:06:34 +00:00
Denis Dupeyron 46dc176f9e Copy of r208 to trunk, with Rodzilla's benediction.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@210 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-26 13:22:41 +00:00
Christian Ohm c146fef270 - Prepare for using the lex/yacc files instead of the generated c files.
Works only with the provided Makefiles. To use it, replace the
xxx_l.c/xxx_y.c lines in the Makefile with xxx_parser.y/xxx_lexer.l (the .y
file has to be first). The game compiles with all of them, but hangs on
loading a game when using script_lexer.l/parser.y, and hangs on start when
using level_lexer.l.
- Inevitably: Compiler warning fixes.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@206 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-23 00:00:50 +00:00
Christian Ohm 3a9f621a38 - Fix a wrong function definition/call in multiint.c.
- Give the lex/yacc generated code unique variable names.
Those two changes now make it possible to compile the game with g++ using
the "-fpermissive" compiler flag.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@205 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-22 22:39:13 +00:00
Christian Ohm 6170f498a7 - Fix more compiler warnings.
- For that, removed lots of unused code, mainly from the lex/yacc generated
files.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@204 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-22 21:59:53 +00:00
Christian Ohm 6fdc00e9c3 Add a missing "!" so the game actually runs again (I guess that was the
reason I couldn't sleep...).



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@203 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-21 02:00:42 +00:00
Christian Ohm 4fc0c26f6d Remove the last traces of stubs.c in both ivis directories (and thus fix
building the software renderer with automake).



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@202 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-20 23:24:44 +00:00
Christian Ohm fd0ff3ccdb - Fix a crash with missing videos (by devurandom, slightly modified).
- Check if video mode could actually be set.
- Clean up the lex/yacc generated files a bit.
- Warning fixes.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@201 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-20 23:01:33 +00:00
Christian Ohm 6cd530686f Change STRING to unsigned to avoid crash with international characters.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@199 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-20 22:18:33 +00:00
Rodolphe Suescun fef9923a01 trunk/crossplatform is the new place for stable crossplatform sources.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@198 4a71c877-e1ca-e34f-864e-861f7616d084
2005-07-18 05:29:39 +00:00
Dion Mendel 9337603e85 Merged r24:51 from branches/noid/linux. Changes improve platform
independence.  Summary follows:

* Ensure that all source files include an end of line character in the
  last line of the file.  Some compilers will complain otherwise.
* Fix case sensitivity of all #included filenames.
* Fix system include files e.g. <stdio.h>, not "stdio.h"
* Wrapped compiler specific asm statements inside #ifdef _MSC_VER
  conditionals.
* Fixed function declarations that were inconsistent with their
  definitions.
* Replaced #ifdef WIN32 with #ifndef PSX to aid in porting.
* Added #ifdef WIN32 conditionals around win32 specific code.
* Replaced MSVC++ specific &(type_cast)var feature with portable
  replacement.
* Fixup inline function declarations.
* Replaced sscanf1() with portable sscanf("%n") replacement.
* Renamed global variable gamma -> gammaValue to avoid namespace
  conflict.
* Added replacement macros for min/max provided by win32.
* framework/frameresources.c: use platform independent stdio functions.
* framework/input.c: Added setMouseUp() and setMouseDown() functions.
* framework/screen.c: Added platform independent pixel format accessors.
* ivis02/dglide.h: Added preprocessor conditional to prevent multiple
  inclusion.
* netplay/netplay.h: Removed duplicate definition of UDWORD.
* netplay/netsupp.c: Added missing include file.
* src/multilimit.c: Corrected number of args in call to
  pie_GlobalRenderBegin().
* src/csnap.c: Moved SetMousePos() to input.c
* src/frontend.c: Use setMouseUp|Down() functions instead of win32 ones.
* src/frontend.c: Use mouseX|Y() functions instead of win32 ones.
* src/intdisplay.c: Replaced itoa() with portable sprintf().


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@56 4a71c877-e1ca-e34f-864e-861f7616d084
2005-02-28 02:52:18 +00:00
Ben Russon bccde9c643 Updated version to 1.10a
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@16 4a71c877-e1ca-e34f-864e-861f7616d084
2005-02-01 04:49:51 +00:00
Ben Russon edbd2aa0f6 Added Troman's script functions
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@15 4a71c877-e1ca-e34f-864e-861f7616d084
2005-01-30 03:35:43 +00:00