Commit Graph

60 Commits (1e34dc870d004463fc2278c0a92522e0f6065f39)

Author SHA1 Message Date
Dennis Schridde 5a4a9288b0 Patch by Christian Ohm: Gamma controls
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@786 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-09 19:22:24 +00:00
Dennis Schridde d163be853d Christian Ohm's PSX removal part 1.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@777 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-07 16:40:18 +00:00
Stefan Huehner 65e820b246 Add some more missing includes:
seqdisp.c, gtime.c: SDL/SDL_timer.h for SDL_GetTicks()
piesraw.c:          SDL/SDL_video.h for SDL_GL_GetProcAddress()



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@753 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 18:52:52 +00:00
Dennis Schridde 912cf2c8e2 Partially revert r739.
SDL < 1.2.10 doesn't define the string function wrappers.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@747 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 14:56:18 +00:00
Dennis Schridde d39f787caf - Enforce floats in several places
- Define WORD and BYTE types to SDL types
- Let SDL handle some more of the win32fixes


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@739 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-20 19:46:33 +00:00
Stefan Huehner 1395a7c69c Make some more functions static which aren't used outside their
declaring source files and which have no prototype.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@731 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-19 18:45:48 +00:00
Dennis Schridde d889ce9da7 Patch by Christian Ohm: "g++ fixes"
Mainly explicit casts, some type changes, a few fixes.

We need to have a look if this line creates any problems:
lib/script/interp.c @@ -329,7 +329,7 @@
- if(!RetStackRemember(CurEvent, (ip + 2)))       //Remember where to jump back later
+ if(!RetStackRemember(CurEvent, *(ip + 2)))      //Remember where to jump back later


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@719 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-17 20:39:25 +00:00
Dennis Schridde 876ab9a3ba Patch by Stefan Huehner: "code cleanup: static 3, 3a"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@712 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-14 16:30:07 +00:00
Dennis Schridde 7e8990c661 Patch by Stefan Huehner: "code cleanup: static"
Patch marks several function & datastructures without prototypes, which aren't used outside their declaring sourcefiles as static.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@708 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-13 21:14:47 +00:00
Dennis Schridde b9087ef4ca Patch by Stefan Huehner: "code cleanup: void 4"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@706 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-13 21:11:11 +00:00
Dennis Schridde 728b9a9913 - Commit patches "code cleanup: void" and "code cleanup: const" by Stefan Huehner
- Replace every occurence of VOID with void (and LPVOID with void*)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@703 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-13 09:09:05 +00:00
Dennis Schridde 78be6bc2bc Fix double to float assignments by forcing fixed numbers to float.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@698 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-08 20:02:49 +00:00
Per Inge Mathisen 5396324fb6 Remove lots of unused graphics code. (Did the Pumpkin guys EVER delete code?)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@686 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 21:33:29 +00:00
Dennis Schridde be5f08343a Remove Palette code formerly used for the software renderer. (Patch by Christian Ohm)
This seems to also fix the rader flickering without shadows. (Or was this fixed in a previous commit?)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@681 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 13:35:50 +00:00
Dennis Schridde e9c9e47bda Code cleanup: Remove another do-nothing wrapper function.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@676 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-02 22:45:06 +00:00
Per Inge Mathisen d483c052b2 Add basic map editing functions. When in cheat mode, you can use 'w' and 'a' to
raise and lower tile height, and use 'k' to flip tiles. You must trash your
keymap again before you can use this.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@667 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-30 21:12:44 +00:00
Per Inge Mathisen 0aea40e84b Remove some dead code, and silence some warnings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@663 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-30 15:06:49 +00:00
Dennis Schridde 5007fb9570 Fix bug #6758 and make shadow rendering faster.
Christian Ohm also reported that this fixes a bug in shadow rendering:
"And a shadow error (a shadow painted between the object casting it and
the floor where the shadow is) seems to be gone."


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@660 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-29 16:10:06 +00:00
Dennis Schridde 9e0f9ee8a2 Don't call glEndList() if glNewList() was not called.
Related to bug #6758


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@654 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-27 16:16: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 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 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
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 2fe7d306ac Fix some MacOSX issues with order of include/defines, and required conditionals.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@567 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-15 16:33:48 +00:00
Per Inge Mathisen e86f311e96 Put back the prototype for glActiveStencilFaceEXT, which is needed on
Windows despite SDL_opengl.h


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@566 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-12 18:23:39 +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 cc6537bd4f Fix minor bugs and remove some unused code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@561 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-12 16:27:58 +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
Per Inge Mathisen 8adf85a21b Remove obsolete file lib/ivis_opengl/vid.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@556 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-11 22:08:48 +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
Per Inge Mathisen 5b84a97015 Remove remains of a previous iteration of the graphics layer.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@551 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-08 20:58:32 +00:00
Per Inge Mathisen 081ec89b32 Remove legacy graphics code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@550 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-08 20:03:05 +00:00
Per Inge Mathisen 17bc3e60b6 Some cleanup of graphics code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@549 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-08 18:48:06 +00:00
Dennis Schridde effa407152 Don't include GL/glext.h directly. Use SDL/SDL_opengl.h instead.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@545 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-06 17:51:01 +00:00
Per Inge Mathisen 711ca1ff01 Remove a great deal of software renderer related code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@497 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-23 10:35:30 +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 07dcf43518 Fix deprecated function declaration
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@489 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-21 21:46:23 +00:00
Dennis Schridde 2ef17b46a1 Support 16bpp but warn the user about graphics problems.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@475 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-19 21:26:09 +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 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 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 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 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 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
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