Giel van Schijndel
8987ee3aff
Slight refactoring to return as soon as possible, thus not damaging code-readability by large amounts of scope-nesting (specifically if-branches)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5293 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 21:51:29 +00:00
Giel van Schijndel
952cd00d05
Only iterator over the linked list `songList` once to determine the end. Then store a pointer to the last ->next pointer and use it to append to the list instead.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5292 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 21:51:26 +00:00
Giel van Schijndel
f7ead00bb0
* Don't use strtok to separate out lines from files as the line reading loop already takes care of that
...
* Remove now double variable filename and rename line_buf to filename
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5291 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 21:51:21 +00:00
Giel van Schijndel
3fd663fd85
Add --disable-sound to the configure script, to disable sound at compile time
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5290 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 18:34:51 +00:00
Giel van Schijndel
5e4a60ed64
Do not ignore /configure.ac in the .gitignore file
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5289 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 18:34:30 +00:00
Per Inge Mathisen
4f63fba465
Add the map 8c-cockate by forum user zydonk. Original work licensed under the GPL.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5286 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 17:38:53 +00:00
Giel van Schijndel
76192b6534
* Make the level parser state enum a typedef (LEVELPARSER_STATE)
...
* When lev_error() gets called do __not__ ASSERT, use debug(LOG_ERROR, ... instead as the return value of false will be used as an indicator of failure anyway (no need to abort as it will cause the --selftest to always fail)
* Accept empty input files for the .lev parser
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5285 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 17:32:03 +00:00
Freddie Witherden
57cb40c1ed
Some more work on betawidget's event system.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5283 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 17:23:00 +00:00
Per Inge Mathisen
d3123eaac4
Fix issue in patch #1075 - use "/" separator for physfs paths.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5282 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 16:35:24 +00:00
Per Inge Mathisen
a1c47bccf8
patch #1075 : Simplify playlist code. Thanks to Giel for patch review.
...
The playlist file is no a simple list of files to play during the game.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5281 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 15:40:56 +00:00
Dennis Schridde
4f77bdc8e6
Fix: warning: 'static' is not at beginning of declaration
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5280 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-20 14:04:10 +00:00
Dennis Schridde
48ea346406
Revert "Testcommit"
...
This reverts commit r5277.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5279 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-20 08:52:27 +00:00
Dennis Schridde
7534eb48ac
Add hack-note on usage of Vector3uw
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5278 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-20 08:51:50 +00:00
Dennis Schridde
df7933f9f7
Testcommit
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5277 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-19 20:53:00 +00:00
Dennis Schridde
96b6fa329c
Correct Elio's nicknames
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5276 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-19 20:49:55 +00:00
Elio Gubser
66e2bee6d3
main interface buttons finished
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5275 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-19 20:07:24 +00:00
Per Inge Mathisen
4c73e82896
Fix --selftest check in nettypes.c
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5273 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-19 16:44:38 +00:00
Dennis Schridde
d3ad12ff6f
Cleanup visibleObject & Co, and use new data ptr to transfer data to callback.
...
Still has a little global hole in it to transfer wall-locations out of the callback without cluttering the helper struct or the visibleObject() API.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5272 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 22:23:47 +00:00
Dennis Schridde
bd65c4255f
Fix bug #11828 : Raycast visibility now too far
...
Was using squared distances and pseudo-3d vectors in some inappropriate places
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5271 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 22:23:06 +00:00
Dennis Schridde
496d6592b5
Style cleanups, fix typos, make follow-up bugfix patch smaller
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5270 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 22:22:26 +00:00
Dennis Schridde
a128c9df88
Add more vector functions and try to get a common order into them
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5269 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 22:21:48 +00:00
Dennis Schridde
bdf986c0e5
Seperate and reorder functions for easier rebasing of Per's threaded pathfinding
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5268 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 20:44:48 +00:00
Elio Gubser
364c32afea
working on buttons, i replaced my close button with kreuvf's, copyright added 'Copyright (C) 2008 Steven Koenig (for the Close Button)'
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5267 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 19:37:31 +00:00
Per Inge Mathisen
0655255ceb
patch #969 : Rewritten minimap code. This changes the radar window, so that
...
you now always see the entire map on the radar. You can also change the size
of the radar window using the scroll wheel when cursor is over it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5266 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 18:35:25 +00:00
Dennis Schridde
050609a81a
Include music in base.wz
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5265 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 18:26:49 +00:00
Dennis Schridde
419aa5a56b
New vector functions: Vector2i_New, Vector2i_Compare and use bool instead of BOOL
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5264 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 18:26:13 +00:00
Dennis Schridde
c9b9e98dc9
Fix "Create default playlist file; This is an ugly HACK which should be FIXME'd into oblivion some other time" by adding a default playlist file to base.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5263 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 18:25:35 +00:00
Per Inge Mathisen
925c3daced
Quick fix for crash if --nosound is used together with a soundtrack file
...
(which is now created by default). Someone should look more carefully at
this code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5262 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 16:29:10 +00:00
Per Inge Mathisen
1c3835ce23
Add original music soundtracks. If you have a playlist already, you need to delete it
...
or add the music to it manually.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5261 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-17 19:32:17 +00:00
Per Inge Mathisen
0d706d02fd
Forward port workaround for eventRemoveContext crash from 2.1. This will leak some memory.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5260 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-16 20:38:26 +00:00
Per Inge Mathisen
94f523d9ef
Fix bug #11829 : When three players join mp dialog, one drops
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5258 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-16 19:39:42 +00:00
Per Inge Mathisen
6a595d9f85
Correct signedness of dot product in lighting calculation. Fixes lighting
...
bug on Intel Macs. Error introduced in commit r3592. Lesson: Don't use unsigned
if you do not absolutely need to.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5254 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-16 15:09:08 +00:00
Dennis Schridde
61f2e0ef21
Fix MSVC/noC99 compile errors and a potential segfault in visibleObject()
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5253 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-14 11:22:37 +00:00
Elio Gubser
ed4d0af31a
working on main-ingame icons
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5252 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-13 20:41:11 +00:00
Giel van Schijndel
66b56d1c87
Use a pun on the whole Shakespear quote (original is: "By the pricking of my thumbs, something wicked this way comes."): "By the picking of these code-bombs, something wicked this way comes."
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5251 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-13 12:22:41 +00:00
Dennis Schridde
d24d632e62
Simplify raycasting by making it vector based (3D vectors instead of 2D values to make it future proof to my next attack)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5250 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-12 20:11:50 +00:00
Dennis Schridde
3e8fa065b8
Minor cleanup and dont use globals for callbacks in raycast.c anymore
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5249 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-12 20:11:42 +00:00
Dennis Schridde
74d6424fdc
Remove unnecessary inclusion of raycast.h
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5248 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-12 20:11:36 +00:00
Dennis Schridde
a31dce8cbc
More vector functions: Conversion and integer division
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5247 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-12 20:11:27 +00:00
Giel van Schijndel
f9171b825f
Use sizeof instead of magic numbers
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5245 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-12 13:51:31 +00:00
Dennis Schridde
e56b1580cc
Cleanup raycasting
...
Make parameter to RAY_CALLBACK void* instead of PROPULSION_TYPE.
- Often it was not interpreted anyway, and in the single case where it is used a PROPULSION_TYPE* is now passed.
- Allows more generic raycasting with less globals to keep state. (Not used currently, all globals remain in use.)
Cleanup rayPointsToAngle and add Vector3f wrapper.
Fix an occasion where magic 360 was used instead of NUM_RAYS.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5244 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-12 12:20:20 +00:00
Dennis Schridde
482fbeecf2
Warzone 2100, I have the honour to release you from any license unclarities.
...
New licensing readme as found in http://forums.wz2100.net/viewtopic.php?f=6&t=1818#p17202
Move non-GPL information into seperate file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5241 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-11 16:38:04 +00:00
Dennis Schridde
adcac9d1e8
Add NTW Mod 1.6.6 by Delphinio under GPL2+
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5240 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-11 15:14:55 +00:00
Giel van Schijndel
05d71e2b19
Don't bother warning about some unused parameters in exchndl.c
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5239 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-09 19:58:56 +00:00
Steven Koenig
80a196de48
Print stylesheet:
...
* headings use sans-serif, non-headings use serif - typographic standard
* <a> that contain an href will show the URL in brackets after the </a>
* <a> is no longer underlined and normal text colours are used
* added new class 'locallink' to suppress URLs in brackets for href="#..."
* <pre> border thinned and solid instead of dashed
* <hr> increased width, reduced height
English XHTML readme:
* added class="locallink" to every <a> with href="#..."
* removed first line-break in <pre> to prevent empty line
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5238 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-08 18:04:02 +00:00
Elio Gubser
e5b6cf18b6
continuing work on intfac1.svg
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5237 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-08 17:00:12 +00:00
Per Inge Mathisen
14460d938a
Make sure that packet size is turned into big endian before we send it.
...
This breaks network compatibility with everything older than this commit.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5234 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-08 14:22:44 +00:00
Per Inge Mathisen
a05859644a
Fix two mistakes in r5176 (static string cleanup) that made us copy far
...
less from two strings than we should.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5233 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-08 13:30:05 +00:00
Dennis Schridde
504ffcc625
Dont output any warnings in external sqlite.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5231 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-07 19:11:14 +00:00
Steven Koenig
88a486d14c
English readmes:
...
* Added information to the section 'Cheats'; updated TOC
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5230 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-07 17:43:05 +00:00