Commit Graph

609 Commits (33798e384aca9d551802a330602b53779c2862ec)

Author SHA1 Message Date
Roman C 01259aaab9 -fixed and enabled shared ally vision for TEAMPLAY and 'Locked Teams' modes
-fixed disabled players allying their team members
-reenabled God Mode (Ctrl-G) for Debug builds and campaign mode

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@769 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-28 02:11:19 +00:00
Dennis Schridde 3f748bd1c2 ChangeLog changed slightly
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@768 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-27 22:29:51 +00:00
Roman C f969666097 Testing commit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@767 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-27 21:23:31 +00:00
Roman C 4d8091f180 Testing commit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@766 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-27 21:17:28 +00:00
Roman C ab31cd4fde Last player cannot be disabled in skirmish menu anymore.
Fixed disabled AIs showing up in the game.
(r763 related fixes)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@765 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-27 05:38:51 +00:00
Roman C 09f607afbc Unused variables cleanup.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@764 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-26 18:25:36 +00:00
Roman C 9aaae50baa Replaced 'Humans vs AIs' with 'Locked Teams' alliance mode.
Fixed difficulty slider applying settings to the wrong players.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@763 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-26 18:14:05 +00:00
Dennis Schridde 37afd5d1c4 Use platform.h instead of direct includes.
The whole system has to be tuned further but this shows the direction.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@762 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-25 22:04:35 +00:00
Roman C 30faef0ce8 Temporary MSVC fix to r749
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@761 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-25 20:14:55 +00:00
Roman C 66252e097c Fixed 'Texture file not preloaded' bug
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@760 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-25 17:00:40 +00:00
Stefan Huehner 532ada3156 Add doxygen style headers to .h files to document
their meaning.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@759 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-25 16:46:28 +00:00
Dennis Schridde eca1bc76ed Fix up r749 for Mac.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@758 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-25 16:17:38 +00:00
Stefan Huehner c74f654310 Make two structures static and add some const
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@757 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-24 19:18:19 +00:00
Stefan Huehner 30f6dc392e mark some Strings an read-only by adding const.
On the way replace STRING with char



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@756 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-24 19:11:34 +00:00
Stefan Huehner bc25579a7a Correct openal buffer: void *pMem -> ALuint iBufferName
as openal 'buffers' are indexed by ALUint.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@755 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-24 18:53:08 +00:00
Dennis Schridde 9d1d34d2a9 Convert PIE types to SDL types.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@754 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 21:25:56 +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
Stefan Huehner 04d0181777 Include input.h for SetMousePos, mouseX, mouseY prototypes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@752 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 18:42:35 +00:00
Stefan Huehner 567fc10e50 Include missing input.h in frame.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@751 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 18:40:07 +00:00
Stefan Huehner b3e3d17b82 Include frameresource.h directly in its users. Fixup after
the big cleanup in 748:749.




git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@750 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 18:38:12 +00:00
Dennis Schridde 3261a09baf BIG cleanup of headers.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@749 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 17:24:55 +00:00
Dennis Schridde a135ae55be Forgotten in last commit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@748 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-23 15:38:24 +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 6fc01a0289 Don't enforce the GPL by breaking it. ("All rigths reserved" is part of the copyright notice and thus must stay.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@746 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-22 11:10:20 +00:00
Roman C f84861b762 Updated frontend.wrf to make it load new texture page. Needed for the previous commit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@745 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-21 22:56:06 +00:00
Roman C 741250cef3 -Added "Humans vs AIs" alliance mode: Humans and AIs make 2 teams, alliances cannot be created or broken
-Added now frontend texture to frend.img
-Disabled "Allied players send vision to each other automatically (only once)" for "Allow alliances" alliance mode, since (x allied y) is not a transitive relation in this mode

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@744 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-21 20:42:48 +00:00
Dennis Schridde bc58f97c4c Patch by Christian Ohm: "g++ unbreakage fix"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@743 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-20 21:34:38 +00:00
Stefan Huehner 1bd660ca36 mark readonly string parameter as const. Remove superflous
protoype in keymap.c as the prototype from keymap.h is included.
Remove 2 commented out prototypes in keymap.h



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@742 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-20 20:58:13 +00:00
Stefan Huehner bf2f8c5e8e Remove an unnecessary and wrong cast.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@741 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-20 20:50:29 +00:00
Dennis Schridde 915ef314df Fix last commit (check pointer against NULL is probably more clear than implicitly converting it to bool).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@740 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-20 19:52:06 +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
Dennis Schridde e139fc583d Change trunk/ versions on Windows to 9.9.9 to indicate a development version.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@738 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-20 19:43:39 +00:00
Stefan Huehner ae8467e580 Make more functions static.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@737 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-20 15:18:37 +00:00
Dennis Schridde f4be2a7f37 Patch by Christian Ohm: "g++ unbreakage"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@736 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-20 08:16:11 +00:00
Stefan Huehner 5215f1ab44 Make more functions static.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@735 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-20 01:12:13 +00:00
Stefan Huehner ac7da134bd Make more functions static which aren't used outside their
declaring source files.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@734 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-20 00:49:20 +00:00
Stefan Huehner a5b8c5a451 Add doxygen headers describing files in gamelib
(using description which were already there)



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@733 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-19 20:25:16 +00:00
Stefan Huehner d913adc42e Add doxygen comments the the hashtable header
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@732 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-19 19:58:06 +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 1b520925ec Clarify names, add docs, add OP_FUNC etc. to aOpSize so the opsize can be retrieved through aOpCode[opcode], make retStack* functions static, improve the return address stack to be easier to understand.
Patch created after ideas of Christian Ohm.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@730 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-19 16:30:50 +00:00
Roman C 15b02fe669 Fixed script compilation bugs,
further scripting enhancements.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@729 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-19 16:07:06 +00:00
Dennis Schridde 139f769d2d Fixed the video. Last commit was done with a texteditor. ;) This one is done with a hexeditor and carefully looking after the size of the changed string.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@728 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-18 22:56:37 +00:00
Dennis Schridde 44cc4058b4 Enforce GPL. (Was GPL before, according to the original readme.txt by Pumpkin. Just changed the apparently wrong statement inside the file.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@727 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-18 21:32:49 +00:00
Dennis Schridde 772dc32c29 Change the website to rootzilla
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@725 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-18 20:58:27 +00:00
Dennis Schridde 54a7db8889 Bring latest fix also to trunk
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@724 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-18 19:58:55 +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
Angus Lees ea15befafe Update Debian packaging to "warzone2100" name.
Remove executable svn property from warzone2100.png


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@718 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-17 14:20:14 +00:00
Dennis Schridde 75af155bbf Patches by Stefan Huehner: "code cleanup: void 5, static 4" and a slightly modified "doxy 1"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@717 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-16 17:41:40 +00:00
Dennis Schridde a88bbc0c37 Patch by Stefan Huehner: "string 1"
Replace all STRING with char or const char.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@716 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-16 16:02:17 +00:00
Dennis Schridde 02ee180072 More warnings in debug mode.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@715 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-16 15:56:26 +00:00