Commit Graph

452 Commits (37afd5d1c4ee75a18688c2bab9d1de58d04407e4)

Author SHA1 Message Date
Dennis Schridde 3b59d20acb Patch by Stefan Huehner: "code cleanup: playlist.h"
Comment by him:
Patch removes the playlist prototypes from the c-file cdaudio.c and add an extra header playlist.h for them.
This is then included in both cdaudio.c and playlist.c



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@707 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-13 21:13:19 +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 fc4ce66939 Patch "code cleanup: void 2" by Stefan Huehner
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@705 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-13 12:58:32 +00:00
Dennis Schridde 7d0d4faa49 Patch "code cleanup: void 3" by Stefan Huehner
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@704 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-13 10:54:35 +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 e0fda9c0b9 Forgot to change the file info for the Windows exe...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@701 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-08 22:55:20 +00:00
Dennis Schridde fe1a94f6dc - Mark possibly breaking assignments
- Don't declare stdint declarations which are allready declared in SDL_config
- Change only use of stdint type to use SDL type instead

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@700 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-08 20:05:38 +00:00
Dennis Schridde fad48ad4f8 Fix multiple definitions of the MAX macro.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@699 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-08 20:03:55 +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
Dennis Schridde dcd97ac079 Use ASCII version of functions for Windows instead of UNICODE versions.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@697 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-08 20:01:09 +00:00
Dennis Schridde 93389e9d3f Include frame.h into .y files using free and malloc, so they get the redefinitions needed for msvcrt malloc debugging.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@696 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-08 19:59:00 +00:00
Dennis Schridde e80250bf2b - Fix paths
- Define VERSION
- Link against shfolder.lib for compatibility with Windows versions older than Windows 2000.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@695 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-08 19:01:47 +00:00
Dennis Schridde 2449a2f5d3 Fix the version. *sigh, I hope I don't forget anything else...*
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@693 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-07 18:16:01 +00:00
Dennis Schridde d5579035b4 Updated ChangeLog with latest fixes and 2.0.5_rc1
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@691 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-07 17:50:58 +00:00
Dennis Schridde dad411003e Add SVG version of Warzone 2100 icon. (bug #6548)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@690 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-07 17:28:14 +00:00
Dennis Schridde 1e476c2074 Possible fix for bug #5188 (Wrong tileset)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@689 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-07 17:13:50 +00:00
Dennis Schridde e057d6240c Finalize VIDEO_QUIT callback fix on request of Troman.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@688 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-06 17:19:20 +00:00
Roman C 96f59fbb50 Fix to #6735 and #6751,
also fixes some beacon-related code

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@687 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-06 16:58:20 +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 915390aa1b Fix possible bugs when having deeper pointers than probably intended.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@685 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 20:32:01 +00:00
Dennis Schridde 6094ea9bbf Fix ASSERT() to be standards compliant and compile with g++.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@684 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 20:30:46 +00:00
Dennis Schridde 2208c79ea4 Fix sound init reporting "Sound disabled!" even when sound was enabled.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@683 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 20:29:54 +00:00
Dennis Schridde 7671bf79e9 Update ChangeLog for commandline option changes (shadow,sound)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@682 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 17:20:01 +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 1607f7e194 - --(no)sound toggles sound initialization (to explicitly disable sound)
- --(no)shadows toggles shadows (instead of --shadows yes/no)
- Removed unused functions from warzoneconfig


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@680 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 12:41:55 +00:00
Per Inge Mathisen de5553bd9f Fix bug #6840, assert failure when pressing 'Edit' button in the
options dialog (ctrl+o), by removing the button when not #define
EDIT_OPTIONS, since it does not do anything other than cause 
crashes at the moment.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@679 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 12:01:14 +00:00
Per Inge Mathisen b37fd5d62f Make some code more readable
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@678 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 11:22:51 +00:00
Per Inge Mathisen 72be7c92b5 Fix assertion failure when editing keys
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@677 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 10:06:51 +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 b7b01e70b6 Remove some dead code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@675 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-01 21:01:17 +00:00
Dennis Schridde 346a73eba8 Comment out a forgotten ex-DBP0 call.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@674 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-31 20:15:29 +00:00
Dennis Schridde 2c460e920b - Remove all references to DBP0()
- Add Irrlicht evaluation to TODO


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@673 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-31 20:14:21 +00:00
Dennis Schridde 67aefda0d5 Update TODO
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@672 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-31 18:58:29 +00:00
Per Inge Mathisen f879573c3f Enable droid scaling code again, but no keys available for it, so you have
to edit the keymap code yourself to see it. New cheat code, "count me",
prints the number of objects in the game.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@671 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-30 21:51:04 +00:00
Dennis Schridde c732c320a4 Update version to 2.0.5_pre and reorder options
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@670 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-30 21:39:57 +00:00
Dennis Schridde 8a7f226a37 Add map editing to ChangeLog
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@669 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-30 21:18:41 +00:00
Dennis Schridde 9ad1a20e36 Updated ChangeLog. Missing items for 2.0.4 and new items for 2.0.5
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@668 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-30 21:15:47 +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
Dennis Schridde fc147e9bd6 Add a --shadow toggle to commandline options to enable or disable shadows. Patch by Suprano.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@666 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-30 19:31:50 +00:00
Roman C 63303fa4e2 Fix: should compile under linux now
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@665 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-30 17:41:39 +00:00
Roman C d10c3bb0bd Ctrl+MouseWheel makes game speed up or slow down,
Using mouse wheel over radar makes radar zoom in/out, 
Added ability to put beacons using the radar, 
Tweaked beacon placement coordinates.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@664 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-30 17:02:58 +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 a18890b6dd Quick fix for http://wz.rootzilla.de/forum/index.php?topic=62.0
Troman, please revise this!

Do we need to (and can) call something similar to eventFireCallbackTrigger((TRIGGER_TYPE)CALL_VIDEO_QUIT); to notify scripts that the video has ended? (eventFireCallbackTrigger() can't be called here because we are called from a trigger.)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@662 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-29 19:57:34 +00:00
Dennis Schridde 6bc302b059 Don't use an .exe extension for Linux binaries in Makefile.raw builds. Patch by Christian Ohm.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@661 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-29 16:15:11 +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 d635b5c013 Fif unitialized value reported in bug #6781.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@659 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-29 16:07:56 +00:00
Ari Johnson c8ca8384e3 Minor fix to MacOS X application bundle script
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@658 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-28 17:15:12 +00:00
Dennis Schridde 0b527d49e2 Fix compile stoper from r649.
Ari: Please have a look at this! If this is wrong fix it please.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@657 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-27 20:32:40 +00:00
Dennis Schridde 76b6d70f6d Remove any occurences of GetTickCount() (a Windows function) with SDL_GetTicks() which was used on non MSVC anyway.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@656 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-27 19:09:35 +00:00
Dennis Schridde 7f3693b592 Revised framecounting to give correct results and use more informative names.
Also removed some unused framecounting functions.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@655 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-27 19:01:34 +00:00