Per Inge Mathisen
eb3ac2e356
Fix bug #11911 : two patrol buttons. Patrol now has a new icon, drawn by
...
elio. Circle now has correct tooltip and uses old patrol icon. Some
spelling issues also fixed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5565 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 12:06:26 +00:00
Per Inge Mathisen
d98f300696
Show all buildings in radar window. This makes the building under attack
...
colour change feature work correctly, too.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5563 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-16 11:13:36 +00:00
Per Inge Mathisen
94aca87927
Fix bug #12016 : radar is broker on trunk, reported by Michael Strobel. We now
...
use the texture rectangle extension to draw the radar window, which should be
supported on even the oldest OpenGL-capable hardware out there.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5562 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-15 20:06:09 +00:00
Giel van Schijndel
ac5c52031b
Get rid of unnecessary assignment of `volume` to `music_volume`; just utilize clipf right away on `volume`
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5559 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-15 13:01:22 +00:00
Giel van Schijndel
0d670c0409
Don't bother checking whether bitflag ID_ALLOC is set before removing it, the end result is the same anyway: ID_ALLOC being absent from the bitmask/number
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5558 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-15 11:46:12 +00:00
Freddie Witherden
b48b8058e8
Add support for timer events and fix a bug in event id generation.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5557 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-15 10:12:03 +00:00
Giel van Schijndel
bef2d4cd6a
Update Xcode project for the addition of src/positiondef.h in r5531 and the removal of lib/framework/treapint.h in r5544
...
Patch by Tim Baumgartner
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5556 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 23:43:55 +00:00
Freddie Witherden
355d0c0760
Make it so that the event-removal system in betawidget actually works.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5555 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 23:41:53 +00:00
Freddie Witherden
86dd924881
Minor cosmetic improvements to betawidget.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5554 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 23:19:51 +00:00
Giel van Schijndel
d7a0c2fa9b
Don't bother checking whether bitflag ID_ALLOC is set before removing it, the end result is the same anyway: ID_ALLOC being absent from the bitmask/number
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5553 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 23:17:23 +00:00
Freddie Witherden
fede6c6e51
Fix a bug in vectorAt which could cause a segfault; add vectorHead which returns the last element added to the vector.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5552 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 23:08:37 +00:00
Giel van Schijndel
0c4b256797
* Out with the (unnecessary! as the size guarantee isn't required) WORDs from treap.[ch]
...
* Restructure treapStringCmp to be __readable__
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5551 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 22:09:31 +00:00
Giel van Schijndel
8db7c031ff
Fix some compile errors that occur when DEBUG_TREAP is #defined
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5550 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 22:09:15 +00:00
Giel van Schijndel
379a905c6c
* Move the type definitions of TREAP_NODE and TREAP from treap.h to treap.c (use a forward declaration in the header instead)
...
* Don't strdup strings retrieved from __FILE__ directives; just store const char* the pointer instead (prevents a memory leak as well)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5549 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 20:41:22 +00:00
Giel van Schijndel
9e70aaf07c
Get rid of macro TREAP_NODE_DEBUG and move its contents to the only location where it's used: struct TREAP_NODE
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5548 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 20:25:48 +00:00
Giel van Schijndel
077d4efefe
* Remove unused functions treapReset, treapDisplayRec and treapDisplay
...
* Remove unused macro TREAP_DISPLAY
* Directly use function treapGetSmallest, treapDel, treapFind and treapDestroy instead of macros TREAP_GETSMALLEST, TREAP_DEL, TREAP_FIND and TREAP_DESTROY respectively
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5547 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 20:22:19 +00:00
Giel van Schijndel
9f3371dc33
Remove macro TREAP_NODE_BASE and move its contents directly into TREAP_NODE as that's the only place where this macro is used.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5546 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 17:53:03 +00:00
Giel van Schijndel
6e9db52984
Get rid of the unused, default comparison function for the values in treap nodes
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5545 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 17:49:10 +00:00
Giel van Schijndel
730188c081
* Get rid of treapint.h which declares prototypes for functions that are only used in treap.c.
...
* Declare these functions with static linkage instead.
* Update autotools buildsystem, Code::Blocks project and MSVC project, raw win32 Makefiles don't need an update
NOTE: This may require updating of buildsystems not mentioned above
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5544 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 15:19:08 +00:00
Giel van Schijndel
514d96d72a
* Don't #inlcude treap.h in frame.h as only a single file within Warzone depends on the treap code
...
* Use a forward declaration in strres.h to declare a pointer to a TREAP instead of importing the full treap.h declarations in strres.h and thus large portions of the codebase
* Rename TREAP's forward declaration name from _treap to TREAP
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5543 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 15:09:00 +00:00
Giel van Schijndel
5348e1e4ae
Properly set the svn:eol-style property
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5541 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 14:04:28 +00:00
Freddie Witherden
89523ccf9f
Make sure we zero a widgets user data when we initialise it.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5540 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 08:51:55 +00:00
Giel van Schijndel
b7f1b4aae1
Read some scripts using their __lower-case__ name (as these file's names are lower-case)
...
This might fix bug #12011
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5539 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 22:25:44 +00:00
Giel van Schijndel
cb1db1ff61
#include stats-db2.h in stats-db.h, as the former is intended to eventually replace the latter
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5537 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 21:30:15 +00:00
Giel van Schijndel
ec4784973e
Add the used command line to crash dump reports
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5536 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 21:26:09 +00:00
Giel van Schijndel
83b63b71b9
Add PhysicsFS version info to crash dump files
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5535 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 21:01:28 +00:00
Giel van Schijndel
7749b59280
Don't remove stats-db2.h when using "make clean"
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5534 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 19:36:58 +00:00
Giel van Schijndel
30cbbefcbd
Mark the #include from src/ in chat_lexer.l with a FIXME
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5533 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 19:22:11 +00:00
Per Inge Mathisen
d7eabccb74
Comment out alIsSource assert
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5532 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 18:46:53 +00:00
Giel van Schijndel
5526f2c61a
* Move type OBJECT_POSITION (and macro POSITION_OBJ to declare it) from structuredef.h to the new file positiondef.h
...
* Update build systems: autotools, raw win32 makefiles, Code::Blocks project and MSVC project
* Rename _droid and _base_object forward declaration types to DROID and BASE_OBJECT respectively
* Add two forward declarations for BASE_OBJECT and DROID to scriptfuncs.h so that it can declare pointers to these types
* src/messagedef.h depends on lib/ivis_common/ivisdef.h and src/positiondef.h so #include those
* Don't #include stuff from src/ in lib/script/chat_processing.h
* Remove all unnecessary #inlucdes from src/ from lib/script/chat_lexer.l
NOTE: Build systems not mentioned above might need updating.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5531 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 18:15:03 +00:00
Per Inge Mathisen
ae2c501b8f
Use power-of-two texture for radar again. Fixes support for ancient gfx cards.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5530 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 18:10:58 +00:00
Giel van Schijndel
77f6e2e90c
Print the dpid on NET_LEAVE messages as well
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5529 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 17:36:29 +00:00
Freddie Witherden
d4168f712c
Make it possible for an event handler to remove itself.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5527 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 15:40:58 +00:00
Per Inge Mathisen
96f1ad47af
Make CHECK_DROID() call a new function checkDroid() to make it more obvious
...
which check fails. You can still see in which file and line it failed, as before.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5526 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 11:54:41 +00:00
Giel van Schijndel
13c4c559c5
* Move the definition of struct BRAIN_STATS from statsdef.h to stats-db2.tpl
...
* Make it possible to declare "references" to struct WEAPON by adding a %fetchRowById code block
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5525 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 21:45:42 +00:00
Giel van Schijndel
8344514617
Make sure to use the %prefix and %suffix when declaring pointers to structs
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5524 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 21:39:49 +00:00
Giel van Schijndel
aad47ff640
Add a new struct level qualifier: %fetchByRow
...
* User code can use this to provide code that the SQLite code generator can use to get a pointer to some other struct
* Make it so that you can only declare member fields with a `struct` type when the respective struct has a %fetchByRow directive in it
* Generate loading code for struct-type fields in the c_sqliteload codegenerator by means of the code provided by the %fetchByRow directive
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5523 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 21:30:05 +00:00
Per Inge Mathisen
c2fe7de339
The fix to bug #11829 : When three players join mp dialog, one drops, in r5258
...
had a little bug of its own, that made player 3, 5, and 7 drop instead. Fixed!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5521 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 20:36:59 +00:00
Giel van Schijndel
b464ee82a5
Don't generate SQL code (that's SQL statements for table definitions as well as SQLite loading code) for fields of type C-only-field
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5520 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 20:36:45 +00:00
Giel van Schijndel
9eb61150c0
Add a new datatype to the mini database schema meta language: `struct`
...
* Allows "linking" in the database to other struct instances
* Will be represented as a pointer to the target struct in the C datastructures
* Will be represented as an integer ID in tables
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5519 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 19:48:39 +00:00
Giel van Schijndel
caa467d9ee
* Improve error message generated on type mismatch by code generator c_sqliteload
...
* Fix a syntax error in code generator sql_tabledef and add and initialize the used variables to produce an error message
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5518 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 19:17:08 +00:00
Per Inge Mathisen
58792b6df1
Fix erronous error reporting
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5517 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 16:21:00 +00:00
Per Inge Mathisen
e2064a4927
Add error check in NETsendGAMESTRUCT - dump warning to log if fails.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5516 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 11:50:18 +00:00
Per Inge Mathisen
a2ca8dedaf
Improve logging in NETbcast. Change parameter type of NETBroadcastPlayerInfo so
...
that it takes unsigned like all its users.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5515 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 11:20:47 +00:00
Per Inge Mathisen
117fa9e961
Cosmetic improvements to netplay debug log calls.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5514 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-12 11:02:55 +00:00
Giel van Schijndel
2e5fab25f8
Attach line numbers to the AST of field declarations, and use it when reporting field-related errors
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5513 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-11 22:14:09 +00:00
Giel van Schijndel
1a17b936c9
Move the definition of struct WEAPON_STATS from statsdef.h to stats-db2.tpl
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5512 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-11 22:03:38 +00:00
Giel van Schijndel
65dee90e74
Accept all of ([US]D?WORD|[US]BYTE) as "transition" types in the mini database schema meta language
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5511 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-11 21:53:10 +00:00
Giel van Schijndel
e33f083aaf
Give errors when encountering unmatched struct-level and enum-level directives
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5510 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-11 21:48:34 +00:00
Giel van Schijndel
859be18724
Move the definitions of structs SENSOR_STATS, ECM_STATS, REPAIR_STATS and CONSTRUCT_STATS from statsdef.h into a single definition in stats-db2.tpl
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5509 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-11 19:40:49 +00:00