Commit Graph

112 Commits (2063d578c3c1c3e28c50497fd3297dc9f1103215)

Author SHA1 Message Date
Dennis Schridde 5bd6e84852 - Change droid->direction to float, this should fix issues with vtols entering a loop around the target
- Make trigonometry tables static and remove usage of FRACT macros (trig.c)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1542 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-27 10:21:17 +00:00
Per Inge Mathisen 534472ce72 Remove used but ineffectual BSP IMD code. BSP data from PIE files not yet removed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1533 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-23 20:40:41 +00:00
Per Inge Mathisen 9e1d57e718 Permit compilation without binary space partitioning. To test this, comment out
the #define BSPIMD line in lib/ivis_common/ivisdef.h header.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1529 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-23 17:59:13 +00:00
Dennis Schridde 345581c9ac Fix a bug introduced in r1469, which produced gaps where the buildings should be and made the terrain jump around. (display3d.c)
Additionaly:
- Cleanup indention
- Remove an unused, commented out function
- Make code a bit more readable
- Insert suggestion into display3d.h (playerXTiles and rx are only use in one otehr file each, so maybe we could wrap them into a function for the purpose of encapsulation. The comment is ugly, I know.)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1479 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 19:09:09 +00:00
Dennis Schridde 5f87829d26 Clean indention and make the code a little bit more readable.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1469 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-15 20:45:09 +00:00
Gerard Krol 6671fa934e 1. Removed the terrible memory leaks from the resource system. 2. Fixed the memory leaks for the terrain tiles. 3. Fixed a lot of uninitialised
variables. 4. Commented out some unused sound code.
I just love Valgrind :)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1390 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-07 13:23:14 +00:00
Gerard Krol f887de8c8f 1. Now only transparent objects are rendered by the bucket sort. 2. Added some asserts to check if droids stay on the map.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1365 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 15:24:03 +00:00
Gerard Krol 7d6382905d Fix some problems introduced in r1286: 1. flickering water edges 2. transparent water was not correctly drawn
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1363 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 14:32:13 +00:00
Giel van Schijndel 26f2672bfd * remove macro PTRVALID
* replace all instances of PTRVALID(ptr,size) by (ptr != NULL)
 * remove asserts of style ASSERT( x == NULL || x != NULL ) because they would evaluate to true always anyhow and as such wouldn't ever trigger
 * remove macros iV_HeapAlloc and iV_HeapFree and replaced them with MALLOC and FREE respectively (that's what they expanded to anyway)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1348 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-03 13:20:41 +00:00
Gerard Krol d775cc8962 r1302 caused smoke to be nontransparent when viewed in front of the sky or fogbox. This is fixed by first drawing the sky and fogboxes and then
the terrain and other objects. (it was the other way around)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1304 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-30 19:41:44 +00:00
Gerard Krol 290fb5ebe2 A speed up for people who are fillrate limited: 1. The stencil buffer is no longer cleared each frame when shadows are disabled. 2. The color buffer
is no longer cleared each frame, but care is taken do draw on the entire screen so that no smearing takes place. This patch gives me about +30 fps. 
(from 45 to 75)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1302 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-30 17:38:35 +00:00
Giel van Schijndel d659136496 * move audio_id.[ch] to lib/sound (because the soundlib depends on it, and libraries shouldn't depend on the main source, i.e. src/)
* further remove audio_GetIDFromStr from src/aud.c and rename audioID_GetIDFromStr (from audio_id.c) to audio_GetIDFromStr
  * also changed calling method of audio_GetIDFromStr, now it returns its retrieved value (ID index number) rather than writing it in a pointer given as parameter

PS MSVC project might be broken, I don't have it so can't check nor fix it

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1288 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-27 18:59:03 +00:00
Giel van Schijndel 902400c774 Warning fixes:
* NULL assignment to a non-pointer -> changed to assignment of 0
 * remove unused variables
 * remove empty function drawEffects (and a commented out line that called it)
 * Fix implicit declaration (of war_GetFog and war_SetFog) by including warzoneconfig.h

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1287 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-27 17:53:48 +00:00
Gerard Krol ee76f4ce10 Tweaks and optimisations for CPU usage. Tiles are no longer added to the bucket sort, and the size of the bucket array is made smaller. The maximum
number of simultaneous effects is down from 2500 to 500 (a big fight has about 200 effects). The effect processing and drawing is now done from one 
loop instead of from 2 (saves on the iterations). The pie_DrawTexTriangle function defaults to non transparent tiles and sets an alpha drawing mode 
only when needed.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1286 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-27 13:56:36 +00:00
Gerard Krol a4c540f24a New shadow code, easier on the fillrate of your graphics card, but uses
more cpu time. Buildings have static shadows, the shadows of 
components/droids get recomputed every frame. Rain/bullets/other effects 
do no longer drop a shadow.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1281 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-24 22:53:18 +00:00
Gerard Krol 9e3acc087c The distance fog (aka Mist) start and end is now dependent on the zoom level. This should greatly reduce the number of popping tiles that can be
seen.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1275 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-20 20:46:26 +00:00
Per Inge Mathisen 4cbf5789ea More clean up of function and variable declarations in display code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1260 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-17 15:30:34 +00:00
Per Inge Mathisen ec4755b181 Remove dead code from mapdisplay.c and clean up the function declarations in
display3d.c, making many static. Most unused functions marked WZ_DECL_UNUSED
rather than removed for now.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1259 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 22:45:30 +00:00
Stefan Huehner 59843ec8a2 Code-cleanup:
- make a lot of functions static
- remove unused extern declarations
- fix one function declarations () -> (void)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1254 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 20:23:35 +00:00
Dennis Schridde 2a74242eb3 - Replaced various vectors with Vector3i and Vector3f (idea by Watermelon)
- Vector3i from lib/ivis also used in lib/audio, maybe want to move it to some more generic place?
- Replace iPoint with Vector2i
- Remove additional integer type declarations from pietypes.h
- Rename all iSprite to iTexture
- Various warning fixes: Unsigned/signed comparisons, uninitialized variables, declared but not defined symbols
- Replace DEBUG_BLOCK with DEBUG_MALLOC (it was virtually the same)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1245 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-16 16:20:16 +00:00
Gerard Krol feff0ef74d Fix the skybox corners moving downwards when rotating the camera with a
factory or research menu open.
menu.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1221 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-08 19:39:00 +00:00
Per Inge Mathisen 2a14556b60 Add skybox. Patch by Gerard Krol. The maximum allowed camera tilt towards
the sky has been increased to allow easier view of the new skyline.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1179 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-24 22:53:33 +00:00
Per Inge Mathisen e7a58327cc Remove the "additive" option and related code, which did nothing.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1174 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-24 20:26:54 +00:00
Per Inge Mathisen 7e2ba186d8 Clean up pie_DrawPoly, renaming it pie_DrawTexTriangle.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1161 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-22 12:07:44 +00:00
Per Inge Mathisen 2b416b26db Remove silly pie_ROTATE_PROJECT macro
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1159 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-21 23:02:14 +00:00
Per Inge Mathisen daaac4b5e3 Clean up redundant copy&paste code. Patch by Gerard Krol with
some stylistic and extra changes by me.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1158 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-21 22:38:52 +00:00
Per Inge Mathisen bbc588699d Turn __attribute__((unused)) into WZ_DECL_UNUSED, which is unset
for compilers other than gcc. Thanks to devurandom for bringing 
this problem to my attention. Also update documentation for
WZ_DECL_DEPRECATED, which had bitrotted. 


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1149 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-19 17:46:06 +00:00
Per Inge Mathisen 78396463a7 Fixes informed by -Wextra for graphics code. Removes much redundant code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1147 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-19 17:18:50 +00:00
Per Inge Mathisen 9f16833e30 Small cleanup of texture loading and handling, removing unused
portions of the code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1132 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-16 23:19:33 +00:00
Roman C f4c4c48dd2 Patch by Gerard Krol:
replaces AND/OR macros with &&/||

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1089 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-10 16:39:39 +00:00
Dennis Schridde 49ceba7503 Add GPL notices to all sourcecode files.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1014 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-15 20:09:25 +00:00
Dennis Schridde f1ad4d83c9 - Expand DISP_HEIGTH/DISP_WIDTH
- Remove an unused function


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@964 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-07 19:29:26 +00:00
Dennis Schridde 37c74739a2 Patch by Shurcool: Selection Box:
1) [FIX/ADDITION] the selection box is now filled in with a translucent shade of grey, like Pumpkin Studios intended it, but it wasn't working due to a bug. Can be disabled with the --noTranslucent command line parameter (theoretically along with all other transparency effects, but in practice it doesn't seem to affect anything else because the check for war_GetTranslucent() is not used anywhere else).
2) [FIX] the selection box now always pulses consistently inwards, no matter in which orientation you drag it (ie. from top-left to bottom-right, from bottom-left to top-right, etc.)
3) [FIX] the selection box doesn't flash/disappear momentarily sometimes when the mouse cursor is positioned at the very edge of the screen anymore


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@961 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-07 13:16:02 +00:00
Dennis Schridde 4e28453441 src/* and lib/ivis_common/piemode.h by me: Cleanup unused functions.
Rest: Patch by Giel van Schijndel: codecleaning patch: lets delete stuff


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@939 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-29 19:56:06 +00:00
Roman C 840312f8ea Patch by Watermelon with slight modifications:
-new ORDER_CIRCLE VTOL command - will defend a certain position flying over it and engaging enemies nearby
-adds additional armor types for all sides of a droid (rear, front, top, bottom, left, right) - additional armor definitions are in body.txt.
Droid damage is now also a function of the impact side.
-adds multi-turret support for VTOLs
-modifies connectors in bodies: first 5 connectors are for ground units, the rest is for VTOL.
-introduces some fixes

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@901 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-17 17:12:14 +00:00
Dennis Schridde 8c0393f7ca Some minor cleanups, removed unused/unneeded functions, stoped debug spamming
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@896 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-08 19:14:32 +00:00
Roman C f3e0227b45 Patch by Watermelon:
-fixes disappearing oil derricks (bug #7740)
-allows structures to have multiple weapons (structureweapons.txt format changed)
-fixes muzzle flash for 2nd and 3rd weapon

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@857 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-25 17:38:27 +00:00
Dennis Schridde ae3f8f3fe9 Patch by Thomas Rast: HP/Reload bars overlaping
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@817 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-05 17:13:02 +00:00
Roman C 9aebc7c2b5 Patch by Watermelon: Droid Multi-Turret Support
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@811 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-04 22:56:28 +00:00
Dennis Schridde 67056c8d24 - Droped a lot of (nearly) unused types from lib/framework/types.h
- Remove lots of unused functions (Windows/DDraw related)
- Now store the used bitdepth in the config and thus make it configurable without having to modify the sourcecode


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@808 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-04 01:11:26 +00:00
Dennis Schridde 5a4a9288b0 Patch by Christian Ohm: Gamma controls
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@786 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-09 19:22:24 +00:00
Roman C e2de834b13 -1.10 AI doesn't build flamer bunkers in the base anymore
-It is now possible to win in a team in 'Locked Alliances' mode, also in this mode a player doesn't lose until all of his team members were defeated
-Game now shows a text message when player has won/lost the game (just a temporary solution to bug #7317)
-Added extra heap debug, should be there at least until we fix bug #6530, as PTRVALID() doesn't seem to detect corrupted DROID pointers on win
-Increased number of iterations A* is allowed to do per frame, which will hopefully speed up pathfinding
-Fixed multiplayer menu slider bug (bug #6529)
-Fixed players not forwarding enemy units visibility to their allies in 'TEAMPLAY' and 'Locked Alliances' modes
-Further scripting engine improvements

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@780 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-08 08:06:46 +00:00
Roman C e34c09439c -New script callbacks
-Added ability to rename players through scripts
-New savegame version: 34 (as a result of the previous point)
-Fixed double messages in online games
-Minor cleanups

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@771 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-30 23:09:12 +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 728b9a9913 - Commit patches "code cleanup: void" and "code cleanup: const" by Stefan Huehner
- Replace every occurence of VOID with void (and LPVOID with void*)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@703 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-13 09:09:05 +00:00
Dennis Schridde 78be6bc2bc Fix double to float assignments by forcing fixed numbers to float.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@698 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-08 20:02:49 +00:00
Per Inge Mathisen 5396324fb6 Remove lots of unused graphics code. (Did the Pumpkin guys EVER delete code?)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@686 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-03 21:33:29 +00:00
Roman C d10c3bb0bd Ctrl+MouseWheel makes game speed up or slow down,
Using mouse wheel over radar makes radar zoom in/out, 
Added ability to put beacons using the radar, 
Tweaked beacon placement coordinates.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@664 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-30 17:02:58 +00:00
Per Inge Mathisen 0aea40e84b Remove some dead code, and silence some warnings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@663 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-30 15:06:49 +00:00
Dennis Schridde d635b5c013 Fif unitialized value reported in bug #6781.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@659 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-29 16:07:56 +00:00
Per Inge Mathisen c30b0a8784 Remove some dead code and fix two warnings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@630 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-25 16:58:49 +00:00
Dennis Schridde 0e288f45e7 - Replace all ASSERT(( )) with ASSERT( )
- Simplify definition of ASSERT(). Now is the same for GCC and MSVC.
  This may not work on versions older than MSVC 2005. If you experience this, please report it!

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@613 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-23 12:58:48 +00:00
Dennis Schridde 62ae49b0ce Replaced all occurences of DBMB, DBPRINTF and DBERROR with their former define.
( DBPRINTF(("Message")); becomes debug( LOG_NEVER, "Message" ); )



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@608 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-22 14:28:49 +00:00
Per Inge Mathisen 081ec89b32 Remove legacy graphics code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@550 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-08 20:03:05 +00:00
Per Inge Mathisen 17bc3e60b6 Some cleanup of graphics code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@549 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-08 18:48:06 +00:00
Per Inge Mathisen 6a42b3d07b Clean up display3d a bit, removing redundant or obsolete code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@505 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-24 19:42:30 +00:00
Per Inge Mathisen 711ca1ff01 Remove a great deal of software renderer related code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@497 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-23 10:35:30 +00:00
Dennis Schridde 27fadd14cf - converted the sources in src/ to use full path includes instead of just the filename.
- marked places where lib/ivis_*implementation* (eg opengl) is needed, because of incomplete lib/ivis_common.

Should improve the understanding of interfaces and code organization.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@431 4a71c877-e1ca-e34f-864e-861f7616d084
2006-05-27 16:37:17 +00:00
Rodolphe Suescun e36796f6ce Made necessary changes so that code can be compiled using g++.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@402 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-01 06:12:28 +00:00
Rodolphe Suescun aa3c7b4ff7 Added shadows as an option.
Alt-S (can be modified) to toggle.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@401 4a71c877-e1ca-e34f-864e-861f7616d084
2006-02-28 14:04:59 +00:00
Rodolphe Suescun 62b6055732 Small change in water rendering code (will require changes
in tilesets).
Fixed 2 memory leaks.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@389 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-19 10:09:20 +00:00
No Author 5ba7ddac6b Create final repository structure.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@362 4a71c877-e1ca-e34f-864e-861f7616d084
2007-06-28 17:47:08 +00:00