Commit Graph

3793 Commits (406fdaea137b2e528a49f8c685ca6b46c9ac3e10)

Author SHA1 Message Date
Per Inge Mathisen 34165e2ec8 Fix bug #11519: crash when saving the game. Reported by Jan Dittberner.
I forgot to add size of compatibility zone header to save buffer size in r4637.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4676 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-18 17:30:59 +00:00
Per Inge Mathisen 01af04febd Change addMultiBut so that you can specify different images for buttons when
they are normal state, pressed state, and highlighted by mouse. Removes ugly
hack to provide highlighting for only some buttons.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4675 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-18 17:05:40 +00:00
Giel van Schijndel 1585b7d55a Add a workaround for the X11 headers #defining Status (i.e. #undef it), to prevent problems
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4672 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 20:55:46 +00:00
Giel van Schijndel 1e0ef48650 Use WZ_DECL_UNUSED to inhibit warnings about unused parameters
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4671 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 20:29:19 +00:00
Per Inge Mathisen af07a3fda7 Move map preview button in line with the buttons above it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4670 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 17:00:19 +00:00
Per Inge Mathisen 01d9402ab5 Add highlight frame around the ready button
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4669 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 16:46:55 +00:00
Giel van Schijndel a85956c8df Make building with multiple threads (make -j3) optional for the crossbuild script
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4668 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 16:09:14 +00:00
Roman C 4c5d34f22b Scripting engine:
Allow global variable declarations to be mixed with trigger and event/function declaration. This allows us to #include script files which variable/event declaration.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4667 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 15:59:43 +00:00
Per Inge Mathisen f89e3bf1a6 Add a question mark button icon.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4666 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 15:49:41 +00:00
Giel van Schijndel 0b96e9ba0a Add the ability to the crossbuild script to build with --enable-debug=relaxed
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4665 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 15:48:41 +00:00
Giel van Schijndel 7b46d4ba9a Parse through all commandline parameters to the crossbuild script by means of a for-loop
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4664 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 15:02:53 +00:00
Giel van Schijndel 40cc8f09ac Give the configure and crossbuild scripts the possibility to specify the compression method on the command line (--with-nsis-compression)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4663 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 14:32:48 +00:00
Giel van Schijndel 5b0612e881 some const correctness
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4662 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 11:53:49 +00:00
Giel van Schijndel 5cdf20261d Update POTFILES.in
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4661 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-16 22:41:47 +00:00
Giel van Schijndel f4d635aab9 ASSERT the type of psDroid __before__ using psDroid
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4660 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-16 21:31:17 +00:00
Roman C 2734594eef Don't abuse interpCheckEquiv() since most type checking is done during compilation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4659 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-16 19:14:58 +00:00
Roman C 55c1d4362e Fix MSVC compilation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4658 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-16 19:12:07 +00:00
Per Inge Mathisen f432051012 Move assert in formationUpdateSpeed under conditional to stop a crash.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4657 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-16 18:05:18 +00:00
Roman C c5e91b5799 Make games less jerky when Aivolution AI is active by preventing AIs from execute their scripts all at the same time.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4656 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-16 17:10:55 +00:00
Roman C cfb955c130 Corrected BB effectiveness against bunkers.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4655 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-16 15:13:43 +00:00
Roman C 26c9ae418a Balance:
-anti tank weapons do 15% more damage to bunkers
-bunker buster does 12% less damage to bunkers
-MG does 200% more damage to VTOLs (effectiveness increased from 25% to 75%)
-increased body points of light cyborg weapons by 40%

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4654 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-16 15:08:20 +00:00
Giel van Schijndel 2f7817c772 * Replace some uses of BASE_OBJECT* with DROID* to reduce yet some casting
* Fix indentation


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4653 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-16 00:15:29 +00:00
Giel van Schijndel 21b3597284 * Formations work purely, and only with DROIDs, so rather than casting back and forth to BASE_OBJECT* pointers, just stick to using DROID* pointers only
* Huge simplification due to not needing to handle other derivatives of BASE_OBJECT than DROID anymore (also a huge reduction in the amount of casting)
 * Don't check whether a DROID has -> type == OBJ_DROID anymore (fpath.c left-over)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4652 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-16 00:01:41 +00:00
Giel van Schijndel 1b071cb08f Cleanup:
* Indentation fixes
 * Const correctness
 * Simplification (less casting) and use "return retval;" rather than "ret = retval; return ret;"


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4651 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 23:11:42 +00:00
Giel van Schijndel 0dd849b875 Const correctness
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4650 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 23:08:38 +00:00
Giel van Schijndel a81756eba5 * Pathfinding works purely, and entirely with DROIDs, so rather than casting back and forth to BASE_OBJECT* pointers, just stick to using DROID* pointers only
* Get rid of some (SDWORD) casting (in all these cases the assignment operator will take care of that anyway)
 * Don't cast an unsigned variable (UDWORD) to a signed integer (int) for printf purposes, use an unsigned integer instead (unsigned int)
 * Remove duplicated code (an if-statement had (X == Y || X == Y) as part of its condition, reduced it to (X == Y))
 * Make the copy of aDirOffset in astar.c const as well


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4649 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 22:54:37 +00:00
Giel van Schijndel a855f10f4e * Make static array aDirOffset const
* Rewrite the Doxygen comment for fpathUpdate()
 * Some style fixes


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4648 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 21:51:26 +00:00
Freddie Witherden 12ff794e99 Update fpathRandChoice to use rand() as opposed to a custom generator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4647 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 21:46:03 +00:00
Giel van Schijndel d96f65d3be Don't include fpath.h if it isn't necessary
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4646 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 21:41:47 +00:00
Giel van Schijndel ade39a7c6f Don't include astar.h if it isn't necessary
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4645 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 21:35:19 +00:00
Per Inge Mathisen c485aa69f5 Weed out some forgotten dead code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4644 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 21:31:35 +00:00
Per Inge Mathisen 1403e9c36a Remove impossible conditional
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4643 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 21:20:53 +00:00
Giel van Schijndel 1bb45ae917 Make apsNodes in astar.c a static array (instead of dynamically allocated)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4642 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 21:19:24 +00:00
Per Inge Mathisen 2e78183ee3 Add tile rotation to tagfile definition file
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4641 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 21:03:50 +00:00
Freddie Witherden 83da7b8008 Commit patch #1055 which cleans up droid.c by removing a large amount of dead code. There should be no functionality changes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4640 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 21:00:20 +00:00
Per Inge Mathisen dda21eb413 Remove zones from tagdefinitions
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4639 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 20:58:53 +00:00
Giel van Schijndel 3e825febcd Update the Code::Blocks and MSVC projects for r4637
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4638 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 20:55:57 +00:00
Per Inge Mathisen ed5ffbfa8b Remove zones and gateway routing. Also remove optimization of path steps by
line of sight raycasting. This removes two whole classes of path-finding bugs
at the cost of some performance. Hopefully we can address performance later.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4637 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 20:52:53 +00:00
Giel van Schijndel 5de54b2936 Lets not depend on the preprocessor's ability to concatenate strings as MSVC doesn't seem to be that good at it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4636 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 18:52:16 +00:00
Giel van Schijndel 8c9e8193aa #define PACKAGE_DISTRIBUTOR to "UNKNOWN" if it isn't defined at the compiler commandline
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4635 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 18:45:35 +00:00
Giel van Schijndel d854beb5d5 Throw out my dirty preprocessor abuse to prevent duplication of a few characters in favour of code reability (apparently for MSVC as well)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4634 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 18:32:51 +00:00
Giel van Schijndel 983e48834c Use GetModuleFileNameA instead of GetModuleFileName to make sure we can build properly, even on Unicode builds
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4633 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 18:25:20 +00:00
Per Inge Mathisen fa0b7162fa Do not assert with invalid position if a droid tries to build where it
stands, and it has no HQ or landing lights to guide it away from there.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4631 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 16:55:44 +00:00
Roman C 24e128b5dc - units get effectiveness boost (equal to the promotion to the next rank) just by being assigned to a commander
- commander-related cleanups

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4630 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 15:15:19 +00:00
Roman C fa90c040c7 Aivolution AI:
-fix AA defenses construction

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4629 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 14:37:11 +00:00
Roman C 77a0763515 Weapon Balance:
-increase LasSat damage and splash damage by 50%

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4628 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-15 13:44:49 +00:00
Giel van Schijndel 36766ec8ce Use a more unified system for the "default" info in exception reports (i.e. the same code for the Windows & GDB on GNU/Linux handlers)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4623 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 23:17:51 +00:00
Giel van Schijndel a1f829c79e Merge r4112 from the 2.1 branch into trunk:
* Fix mistakes noted on the forums


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4618 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 22:58:49 +00:00
Giel van Schijndel 8049b7fbba Merge r4019 from the 2.1 branch into trunk:
Remove ABOUT-NLS and INSTALL
ABOUT-NLS contained unrelated information about the gettext project and INSTALL was just the standard file, with duplicated info in COMPILE.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4617 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 22:56:20 +00:00
Roman C faeb2c05c8 Weapon Balance:
-Cyborg Grenadier: decrease short range accuracy, increased long range accuracy, increased damage by 50%.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4616 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 22:07:10 +00:00