Commit Graph

3634 Commits (3c749e2ee3e7a78beb6a401c42cde6bc3eb26378)

Author SHA1 Message Date
Roman C 4a1cb2db67 Balancing:
-increased hit-points of oil derricks by 100%, since it gets destroyed too easily by lucky shots. Needs testing.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4445 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-31 15:56:12 +00:00
Giel van Schijndel e2f81aaa54 * Add a new resource type (for use with .wrf files): DBPROP which is similar to SPROP, with as difference that instead of a CSV file it specifies an SQLite database file to load from
* Add the code to load propulsions from the propulsion table of the given database file (function `loadPropulsionStatsFromDB`)
  * This code will make sure to load the propulsion stats-data in a similar manner (i.e. the resulting data in-memory should be the same) to the propulsion.txt loading code
 * Use this stats loading implementation on single player


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4444 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-31 14:05:57 +00:00
Roman C 4166f82efa Fix a crash when 7-8 AIs chat at the same time.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4443 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 20:14:03 +00:00
Giel van Schijndel c10e4173fe Utilise getStructureDamage in some more places as a replacement for PERCENT
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4442 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 19:47:42 +00:00
Giel van Schijndel 9ec3b36697 Use getStructureDamage at several places instead of manual screwing with PERCENT
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4441 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 19:33:20 +00:00
Giel van Schijndel 7dbdebe299 * Add a new function getStructureDamage which returns the amount of damage dealt to a structure (expressed as a number from 0.0 to 1.1)
* Remove macro CALC_STRUCTURE_SMOKE_INTERVAL and replace it with a static function (not inline, let the compiler make that decision)
 * Utilise getStructureDamage instead of a rather unreadable call to PERCENT


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4440 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 18:32:51 +00:00
Roman C e892a49048 Console will always show text messages using correct colors, even if console is dropped and alliances change.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4439 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 17:59:13 +00:00
Dennis Schridde 387fbd52d3 Typo in masterserver
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4437 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 17:30:19 +00:00
Dennis Schridde 15a75e90c0 Remove unused strings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4436 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 17:25:10 +00:00
Giel van Schijndel 7f104e75b8 Draw the mouse cursor __after__ the GUI
-> We don't want the mouse cursor to be hidden behind it


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4435 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 16:16:48 +00:00
Giel van Schijndel e89a224b32 Add in support for coloured mouse cursors:
* Add a new configuration option "ColouredCursor", which if enabled will enable coloured cursors ingame
 * Add a new API for setting cursors with: pie_SetMouse (previously frameSetCursor was used)

Patch #956 by Buginator; pie_.*Mouse API done by me (except for the iV_DrawImage invocation)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4434 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 15:44:50 +00:00
Per Inge Mathisen 3ee8a3ed7f Add beginnings of a game self-test. Start with --selftest command line option.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4433 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 14:36:11 +00:00
Giel van Schijndel 9002fb5953 * Rename frameSetCursorFromRes to frameSetCursor
* Make frameSetCursor take a CURSOR (an enum) parameter instead of SWORD


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4432 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 14:11:33 +00:00
Dennis Schridde 36629b8f94 update-po
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4431 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 14:03:11 +00:00
Giel van Schijndel bf57ea088e Also make sure to save the PauseOnFocusLoss option
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4429 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 13:45:44 +00:00
Per Inge Mathisen aa13010bb9 Add error message if you use an invalid command line option.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4424 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 13:26:06 +00:00
Giel van Schijndel 39b6c60501 * Change and clean up the cursors API
* Get rid of resource.h which duplicated code and as such was a maintenance hell/burden


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4422 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 13:23:11 +00:00
Giel van Schijndel aa23ae9074 make pause on focus loss configureable (config option "PauseOnFocusLoss")
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4421 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 12:26:50 +00:00
Roman C 383b92185b Balancung:
make AA projectiles faster.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4420 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 23:24:12 +00:00
Ari Johnson b91006e4f1 Updated Xcode project
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4419 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 20:01:50 +00:00
Giel van Schijndel c7b40d8566 Revert r4416
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4417 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 18:46:37 +00:00
Giel van Schijndel ad68743327 Temporarily disable -Wmissing-declarations for lib/framework
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4416 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 18:33:05 +00:00
Giel van Schijndel 2fb4cf960b Fix compile error introduced in r4413 (oops)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4415 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 18:22:55 +00:00
Giel van Schijndel e9c167118d Fix beacon code for real (r4408 used sizeof for the source variable, while it should be the destiniation)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4413 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 18:16:33 +00:00
Roman C 95f48377d5 Updated ChangeLog (Trunk).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4412 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 18:10:08 +00:00
Roman C 5354c5272f Fixed beacons code corrupting asStructLimits[] on linux.
Patch by Buginator.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4408 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 18:00:30 +00:00
Roman C 5344f90d1c Balancing:
Tank Killer now fires 4 projectiles (to match its turrent gfx), total average firepower stays unaffected.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4407 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 17:45:32 +00:00
Giel van Schijndel 931f87f70a * Remove whitespace from the end of lines
* Add a FIXME note about needing to control the calling frequency of handleAbandonedStructures externally
 * Moved variable reductionAmount into the most local scope
 * Rename iterator `i` to `player`


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4406 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 13:27:54 +00:00
Freddie Witherden 29578ca90f Cleanup of calcDamage in projectile.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4405 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 13:18:05 +00:00
Freddie Witherden 7c08673bcb Commit patch #1030 which prevents structure painting.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4404 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 13:11:04 +00:00
Per Inge Mathisen be566a7d6d Add -Wcast-align and -Wmissing-declarations to autoconf debug builds, and fix warnings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4403 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 23:28:44 +00:00
Giel van Schijndel 359efe39ac Const fix
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4402 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 23:09:32 +00:00
Giel van Schijndel db7f049617 Const correctness
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4401 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 22:21:37 +00:00
Giel van Schijndel c3fcd4bf33 * don't take ownership of sDefaultDesignTemplate.pName as it triggers double free()s
* ASSERT on a condition that __will__ cause a double free()
 * Only assign &sDefaultDesignTemplate to pTemplate if we're sure we can use it


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4400 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 21:32:34 +00:00
Per Inge Mathisen c90b50b75c Workaround for bug when cleaning up template names.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4399 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 21:29:20 +00:00
Dennis Schridde d6347dd5e7 Include climits (instead of unistd.h) for PATH_MAX. Use C++ headers instead of C ones.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4398 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 19:24:31 +00:00
Per Inge Mathisen b58826bce4 Fix assert in widget code by simply increasing maximum major tabs that can be shown.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4397 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 18:41:53 +00:00
Roman C c31930bef7 Fixed asserts in map_Height() which were caused by burn effect being off map.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4396 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 18:19:45 +00:00
Giel van Schijndel 6025e0ccbb * Use a signed integer for "%n" (as the C89 & C99 specs require that)
* Don't initialise vars that don't need initialising
 * Use UDWORD instead of unsigned int as we're passing a pointer to those variables into a function that takes UDWORD* pointers, which can be dangerous if sizeof(unsigned int) != sizeof(UDWORD)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4395 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 18:11:39 +00:00
Giel van Schijndel b77f2e2adc use size_t to store sizeof() values in
Also make those "size" variables const as they're never modified after initialisation


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4394 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 17:44:04 +00:00
Giel van Schijndel 2917a1af70 Make sure to set the pointer to NULL when it's free'd (as it's still in scope)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4393 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 17:41:38 +00:00
Giel van Schijndel ff13f9f9c3 small if-statement restructuring
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4392 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 17:36:45 +00:00
Giel van Schijndel f8d8c3bbff free() when our pointer leaves scope without being assigned to some external pointer (i.e. prevent memory leaks)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4391 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 17:22:19 +00:00
Freddie Witherden 80e85bffb2 Remove some dead (#ifdef RESOURCE_NAMES) code in structure.c and feature.c.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4390 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 17:01:19 +00:00
Roman C 3d706f16c9 Added a debug message to debug beacon crash.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4389 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 16:47:43 +00:00
Freddie Witherden 3d792dcd65 Remove some unused #ifdef'ed code in structure.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4388 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 16:27:31 +00:00
Giel van Schijndel 5e50119a53 Fix compilation of autorevision on Windows (a copy&paste error)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4387 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 15:24:37 +00:00
Dennis Schridde 7a688bdf45 Better debug output
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4386 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 12:08:13 +00:00
Dennis Schridde 40a2257a31 Fix NameError, Remove code duplication by using private method, Move private methods to top
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4385 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 12:02:37 +00:00
Dennis Schridde e28cf1ce77 Using the kludge for GNU Flex < 2.5.30 was slightly incorrect. Correct way is present in 2.5.9 already.
Additionaly use the kludge found on http://flex.sourceforge.net/manual/faq_002dmemory_002dleak.html


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4384 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 11:05:19 +00:00