Commit Graph

4229 Commits (b16387ada85a7511eb7e60b07547a89435b8802d)

Author SHA1 Message Date
Giel van Schijndel 6a5ee556f6 Revert r4830:
* This should fix a heap corruption introduced with the new level_parser

Closes #9 ( http://trac.wz2100.net/ticket/9 )


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5163 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 12:20:23 +00:00
Dennis Schridde ee4b321199 Largely simplified proj_InFlightIndirect.
Largely simplified proj_InFlightIndirect.
Improved readability while functionality should be roughly the same.
Now this is very similar to the Direct function, except for differences noted.

Additionaly:
Comply to Per's codingstyle: Less spaces for more readability!


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5162 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 09:54:42 +00:00
Dennis Schridde 8918fc2788 Comply to Per's codingstyle: Less spaces for more readability!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5161 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 09:54:33 +00:00
Dennis Schridde 1b1aa8f6a0 Improved structure, better layout and more comments for proj_InFlightDirect
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5160 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 09:54:23 +00:00
Dennis Schridde 55ee376dc2 Ignore .wz files, too
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5159 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 22:55:29 +00:00
Dennis Schridde e7a0a57b0e Simplify buildsystem for base.wz/mp.wz and make sure to really regenerate the archives.
This would not always work before, since we just depend on the directory, not each file in it.
This oversight made make not recognize when a file was changed and the archive needs to be regenerated.
We now run zip on every invocation of the data target.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5158 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 22:01:07 +00:00
Dennis Schridde 976240b528 Fix raw makefile dep
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5157 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 21:50:40 +00:00
Dennis Schridde 85ab4e02e9 Move base files from data/ into data/base/ (and stuff from warzone.wz to base.wz respecitively).
Should not create any problems, buildsystems were changed (MacOSX, please test).
Reason: Organisation, later: simplification.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5156 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 21:42:44 +00:00
Roman C d24c8d0eb3 Aivolution: prevent division by zero, this hopefully fixes bug #11725.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5154 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 19:04:42 +00:00
Roman C d89f43106d Make sure we print out script call stack when division by zero occurs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5152 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 14:29:11 +00:00
Dennis Schridde 0d61fb663f Use direct initialisation, since this is easier here.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5151 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 11:03:03 +00:00
Per Inge Mathisen c95da57404 Remove unused WATER_ALPHA_LEVEL define. Alpha channel for water is defined in the tiles.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5149 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-22 20:22:48 +00:00
Per Inge Mathisen 4d845c8067 Fix debug log calls going off when they shouldn't
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5147 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-22 19:33:05 +00:00
Dennis Schridde f94ee4683d *cough*
rad2deg should not look like deg2rad...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5146 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-22 18:27:48 +00:00
Per Inge Mathisen 05ef2e8638 Ugly workaround to fix nearest path calculations.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5145 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-20 20:20:55 +00:00
Giel van Schijndel 2102ab0475 Fix warnings: remove unused variables
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5144 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-20 19:57:26 +00:00
Elio Gubser 32ab48d63e frontend2, frontend3 done, start working on intfac0
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5143 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-20 19:02:08 +00:00
Roman C ebaecc07f6 Fix memory leaks in script_paryer.y the correct way.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5142 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-19 13:53:04 +00:00
Per Inge Mathisen addd9a8e6a Remove unused code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5138 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-18 13:53:43 +00:00
Roman C 775668cad3 Don't manually free() data in the Bison grammar file, since it will be freed by YYABORT anyway. This fixes heap corruption during --selftest.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5137 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-18 12:29:22 +00:00
Per Inge Mathisen d6d6a9919e Commit API only from patch #907: Make texture coordinates into static array.
This fixes a bug with maps smaller than max visible tiles area which would
either crash or create seams, re-reported by Buginator.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5134 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-17 21:48:23 +00:00
Dennis Schridde 0803dc1ca9 Download quesoglc/tags/v0.7.1 for Mac, instead of a nonexistant path.
Reported an fixed by Verminus on the forums: http://forums.wz2100.net/?topic=1747.msg16528#msg16528


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5133 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-17 18:24:42 +00:00
Per Inge Mathisen f6f142fa29 Add more error checking in A* code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5132 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-17 17:48:32 +00:00
Giel van Schijndel 0118573321 Work around Flex 2.5.33 implicitly defining yyget_extra() (rather than forward declaring it)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5130 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-17 10:49:33 +00:00
Giel van Schijndel 13c84db269 Disable optimisations (-O0) for --enable-debug=relaxed as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5129 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-17 10:48:26 +00:00
Per Inge Mathisen 410570c6c1 Set proper svn eol-style on a bunch of files that did not have it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5125 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-16 17:31:51 +00:00
Dennis Schridde 2a895db63e Fix bug #11693. Fix submited by verminus@gna.org
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5124 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-16 14:45:51 +00:00
Dennis Schridde 5b703fb634 Dump OpenGL implementation information to console
Author: Buginator
Signed-off-by: Dennis Schridde <devurandom@gna.org>


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5123 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-15 17:32:39 +00:00
Dennis Schridde b77dfdadad Simplification and slight speedup for trigSin/trigCos. Make trigIntSqrt wrap sqrtf, since the old lookup implementation was probably slower than that.
Author: Björn Bredthauer <Bjoern.Bredthauer@gmx.de>
Date: Thu, 15 May 2008 01:28:55 +0200
Signed-off-by: Dennis Schridde <devurandom@gna.org>


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5122 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-15 00:19:47 +00:00
Dennis Schridde 258c843c44 Calculate muzzle locations as float-vector, for convenience (and because IMDs store info as float anyway).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5121 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-15 00:19:40 +00:00
Dennis Schridde 2334f84c84 Remove unneccessary modulo
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5120 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 22:59:00 +00:00
Dennis Schridde d49d1144e0 r5113 was buggy
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5119 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 21:16:05 +00:00
Dennis Schridde 1bc654f8b5 Add float variant to pie_RotateTranslate
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5118 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 21:15:59 +00:00
Dennis Schridde 7744c514b5 Link to explanation of yaw/pitch/roll
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5117 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 21:15:50 +00:00
Dennis Schridde e2fa380597 Fix up what I think are wrong comments. The axes should be different.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5116 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 20:08:56 +00:00
Dennis Schridde 65553e8eb3 Mistake... I removed CHECK_PROJ_ABOVE_GROUND but forgot one user.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5115 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 19:04:42 +00:00
Dennis Schridde cb3d71029f We already have doubles, skip casting
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5114 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 19:04:34 +00:00
Dennis Schridde f9a57820b0 Move asserts to front
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5113 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 18:31:30 +00:00
Dennis Schridde 81636fa9d8 MSVC was crying
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5112 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 18:23:20 +00:00
Dennis Schridde 4197d2fc99 Prefer local variables over ones behind pointers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5111 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 17:24:59 +00:00
Dennis Schridde fd577efb39 Move penetration code fragments from SendProjectile to Inflight*Func
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5110 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 17:24:51 +00:00
Dennis Schridde 851a930f98 Luxury++: Vector based worldOnMap() variants
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5109 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 17:24:35 +00:00
Dennis Schridde d733b20f49 This patch adds a --host option (to compliment the --join option) to
the game, so you can launch the game via a external client.

Usage:
--host
  (takes you directly to the host screen)
--join ip/hostname
  (takes you directly to the join screen, you should see the game of the
  ip/hostname that you specified.)  The join patch was already comitted.

Author: Buginator
Date: Tue, 13 May 2008 01:23:54 -0400
Signed-off-by: Dennis Schridde <devurandom@gna.org>


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5108 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-14 11:03:33 +00:00
Dennis Schridde 2ded222cfd Simplify proj_InFlightDirectFunc() and make it more readable.
Note: Special hit-handling for homing weapons was removed, since that should already be done by the normal hit-handling.
  (If our target was not among our neighbours, how can we ever be in range to hit it?)

Note: Since this is nearly a rewrite, code-reviews should concentrate on the logic, not on before-after comparison.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5107 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 23:32:23 +00:00
Dennis Schridde 202ebc32fb Step one towards vector based projectiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5106 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 23:32:07 +00:00
Dennis Schridde 974b5aacaa Minor documentation fixes:
- Comment on WSC_COUNTER
- Indention


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5105 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 23:19:20 +00:00
Dennis Schridde be2b8a35ab clip() function for integers (Like CLIP macro) and some slightly altered comments/variable names.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5104 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 23:19:10 +00:00
Dennis Schridde 6493ff1d2d More vector functions:
- Set() functions for Vector3i and 3uw
- Add() for Vector3i


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5103 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 23:18:53 +00:00
Giel van Schijndel 5828b26a10 * Add functions for changing the volume of an already created AUDIO_STREAM: sound_GetStreamVolume and sound_SetStreamVolume
* Use these functions in cdaudio.c to change the volume of the currently playing AUDIO_STREAM in function sound_SetMusicVolume

This fixes bug #11579 ("Music volume slider dont work")


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5101 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 14:01:25 +00:00
Giel van Schijndel 44986c3473 * Make sure to actually set the volume of an AUDIO_STREAM we're creating
* Indentation fixes


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5100 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-13 13:50:08 +00:00