Per Inge Mathisen
7f737d30f1
Fix bug #9652 where water edge would transition to black instead of water when
...
mouse was positioned over a research or production item.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2705 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 13:38:56 +00:00
Per Inge Mathisen
e624663f40
Now that we draw water in a separate pass, we can reduce the number of state changes a lot.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2704 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-04 13:26:04 +00:00
Per Inge Mathisen
f1e9c680a4
Do not use bucket sort for water tiles, instead draw terrain in two passes.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2703 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 23:23:10 +00:00
Per Inge Mathisen
01e24bf6ed
Clean up pieblitfunc. Dump dead code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2702 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:48:46 +00:00
Giel van Schijndel
f1d91e0598
* Remove the "Published by EIDOS Interactive" and "Developed by Pumpkin Studios" strings from the ingame pause screen/menu
...
* Update translation files to have these changes embedded
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2701 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:44:36 +00:00
Dennis Schridde
3a141f2c82
Add property to bind quesoglc
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2700 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:34:13 +00:00
Dennis Schridde
f851174e8e
Proper linking order
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2699 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:13:35 +00:00
Dennis Schridde
2d94849fbc
Update po
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2698 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:13:05 +00:00
Dennis Schridde
94136efe24
Revert to the non-global static_assert, since MSVC is not ready for the global one, yet.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2697 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 21:42:55 +00:00
Per Inge Mathisen
e3fcef4ace
Complete the implementation of ECM (Electronic Counter Measures) in the code.
...
This is still a preliminary implementation, but works. If a source object tries
to see a target object whose ECM power is higher than the source object's sensor
power, the source sensor range is reduced by one third. Cyborgs get an innate
ECM power bonus, and enemies now need to be one third closer to hit them.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2695 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 20:22:40 +00:00
Per Inge Mathisen
c4a30cc54b
Remove dead code
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2694 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 20:01:30 +00:00
Dennis Schridde
e25960c5a4
Remove unnecessary comment and addition to the commitmessage of the last commit (r2692):
...
& TILE_NUMMASK -> function TileNumber_tile(), & ~TILE_NUMMASK -> TileNumber_texture()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2693 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 18:52:22 +00:00
Dennis Schridde
33d42e3119
macro TERRAIN_TYPE -> function terrainType
...
int visibleXTiles -> Vector2i visibleTiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2692 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 18:48:47 +00:00
Stefan Huehner
3b3199b7f9
remove the text.h include from a lot of files
...
which dont need its declarations
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2691 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 17:49:53 +00:00
Per Inge Mathisen
bc6bd2db1e
Fix memory leak when more groups are created than released. See patch #826
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2690 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 17:31:11 +00:00
Per Inge Mathisen
99098a55b6
Silence two more type punning warnings
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2689 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 16:35:39 +00:00
Per Inge Mathisen
ca222db4fe
Clean up flip and rotation code. Reduce use of static globals.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2688 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 16:13:54 +00:00
Per Inge Mathisen
2ac16d28c4
Remove dead code
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2687 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 15:08:06 +00:00
Giel van Schijndel
c76b591954
* In audio_StopAll() __always__ set psSample->psObj to NULL; this should fix bug #9233 (and bug #9927 , which most likely is a duplicate, as well)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2684 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 02:07:25 +00:00
Giel van Schijndel
e3b3379a83
* Replace malloc() calls immediately followed by memset(0) calls by calloc() calls instead
...
* Refactor a linked list iteration to for-loop
* In audio_StopAll() check whether psSample->psObj is marked for deletion (i.e. audio_ObjectDead(psSample->psObj) returns true); if it is, set the pointer to NULL
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2683 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 01:55:11 +00:00
Giel van Schijndel
f69387aa93
* Ignore 4204 warning on MSVC (non-constant aggregrate initializer; aka non-constant struct initializer)
...
Patch by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2682 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 23:33:34 +00:00
Giel van Schijndel
533e7e92bf
* Use spaces for line-out purposes (rather than tabs)
...
* Tune down the volume of the oil-pumps, power-spikes and power hums a bit, to make them less dominant (and annoying) (from patch #822 by Buginator)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2681 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 22:37:20 +00:00
Giel van Schijndel
a316f10a0e
* Don't save the volume with user volume preferences applied (instead save the track-volume so recomputing will be possible)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2680 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 22:19:06 +00:00
Giel van Schijndel
2f3e74a107
* Add include guards to source:trunk/lib/ivis_common/pievector.h
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2679 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 19:43:56 +00:00
Giel van Schijndel
e19e8814b6
* Add a GPL (v2 or later) header to source:trunk/lib/ivis_common/pievector.h
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2678 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 19:41:04 +00:00
Per Inge Mathisen
ec232d7e0f
Actually use audio.cfg configuration of sound volume. Patch by Buginator in patch #822
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2677 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-02 18:47:22 +00:00
Giel van Schijndel
9d83e2ac7a
* Make sure to align publisher text out to the right _correctly_
...
* Changeset inspired by patch #822 by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2676 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-01 20:19:27 +00:00
Per Inge Mathisen
5f39fd4fe1
Add testdata to list of directories to add to warzone.wz in Makefile.raw too
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2675 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-31 17:40:55 +00:00
Giel van Schijndel
613aa478e5
* Declare the .wz archives as PHONY targets in the raw makefile system
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2674 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-31 12:41:26 +00:00
Per Inge Mathisen
ccd725073e
Add extra sanity checking to tagfile code to make it fail earlier rather than later.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2673 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-30 18:51:44 +00:00
Per Inge Mathisen
5567ae6e4b
Add debug log call for tagfile errors.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2672 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-30 16:58:35 +00:00
Per Inge Mathisen
63bee4d150
Fix bad assert check reported in bug #10172 causing Fast Play tutorial not to work.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2671 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 22:23:40 +00:00
Per Inge Mathisen
6e19e51118
Replace int x,y,z in TERRAIN_VERTEX with a Vector2i, and fix two cases of
...
type punned pointer casts.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2670 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 22:00:55 +00:00
Dennis Schridde
06a469ed5b
Simplify Vector2f_Normalise and update docs
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2669 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 21:43:55 +00:00
Per Inge Mathisen
b99feff92f
Merge PIEVERTEX and SVMESH into TERRAIN_VERTEX and use struct assignment instead of memcpy on it.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2668 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 21:41:38 +00:00
Per Inge Mathisen
43196aaf94
Add testdata to list of directories to install. Bug reported by Buginator on IRC.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2667 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 20:14:03 +00:00
Per Inge Mathisen
bf878427c6
Fix use of pointer to byte in a format requiring a pointer to int.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2666 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 20:06:01 +00:00
Per Inge Mathisen
f553173e7e
Silence type punning warning in display.c
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2665 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:58:27 +00:00
Per Inge Mathisen
fe27053bf7
Fix bug in last commit
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2664 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:51:02 +00:00
Per Inge Mathisen
ec0836efdc
Fix type punning warning where we cast an array as a struct pointer in netplay.c
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2663 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:49:39 +00:00
Per Inge Mathisen
a788510e27
Fix type punning of pointers in missionGetTransporterExit
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2662 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:44:36 +00:00
Per Inge Mathisen
81ccff31f7
Convert hash table to use 64 bit keys instead of 32 bit keys, since they are used
...
to store pointers.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2661 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:28:02 +00:00
Per Inge Mathisen
c086e3c529
Clean up hash table code
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2660 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 19:16:16 +00:00
Per Inge Mathisen
70718282a4
Fix shadows looking bad from opposite view direction of shadows, and fix
...
memory leak in shadow code reported in bug #10190 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2659 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 18:52:43 +00:00
Giel van Schijndel
dcbef6f398
* Don't use variable array, structure members in RES_DATA
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2658 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 17:53:37 +00:00
Giel van Schijndel
78eb42b226
* Make sure that non-debug builds are still able to compile with the changes of r2655, by adding #ifdef DEBUG sections
...
* Use ASSERT(!"descriptive string",.. instead of ASSERT(FALSE,..
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2657 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 17:28:25 +00:00
Giel van Schijndel
7191ed7e92
* Set LANG=C in AutoRevision before executing "svn info" rather than the non-portable LANG=en_US
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2656 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 15:40:34 +00:00
Per Inge Mathisen
ad9885b14b
Add some ugly debug code to help track down dangling object references.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2655 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-28 21:47:52 +00:00
Per Inge Mathisen
d668738714
Vector normalization should not be carried out if vector length is zero, as this
...
would divide a vector by zero, which is bad. This closes bug #9739 .
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2654 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-28 16:20:55 +00:00
Per Inge Mathisen
c94ba3829f
Sprinkle a few asserts
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2653 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 23:49:41 +00:00