Commit Graph

3503 Commits (359efe39ac0c4b46b6738eacc41f1de42b049489)

Author SHA1 Message Date
Roman C 5d2c9bb3ae When of the target is bigger than weapon damage the final damage is calculated as follows: damage / 3. It prevents situations when weapons with high ROF stop dealing any damage to their targets.
This addresses bug #11191.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4000 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 17:38:11 +00:00
Giel van Schijndel c4a62d5139 Rename sqlite3.diff to sqlite3.5.4.diff and update it to be a diff against r3997
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3999 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 17:00:31 +00:00
Giel van Schijndel fa47b4ff72 Revert r3997 (we now have the original 3.5.4 in SVN history, at r3997)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3998 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 16:57:11 +00:00
Giel van Schijndel 9e7ba7bc22 Oops, r3994 still had some of our changes in it (r3992 to be precise), so this __is__ the clean 3.5.4 version
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3997 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 16:55:01 +00:00
Dennis Schridde 65dd2bce19 Update the diff to r3995 to log the base revision inside the file (svn diff -r3994 sqlite3.c > sqlite3.diff)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3996 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 14:46:46 +00:00
Giel van Schijndel 4e9e8e60d6 Revert r3994 (we now have the original 3.5.4 in SVN history, at r3994)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3995 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 13:52:21 +00:00
Giel van Schijndel 64dd1a52c5 Revert to SQLite before all modifications (i.e. this is the amalgamation of 3.5.4)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3994 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 13:49:58 +00:00
Dennis Schridde cd14124c47 Fix a few strict-aliasing warnings and 2 types NETenum warnings (in multibot)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3993 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 13:31:08 +00:00
Dennis Schridde f0ab52dbd3 Fix some missing initialisers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3992 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 11:42:18 +00:00
Dennis Schridde d7bb157c7b Strip -Werror from WZ_CFLAGS for sqlite3, since there are far more warnings...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3991 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 11:10:35 +00:00
Dennis Schridde 50ecf5e339 YY_NO_INPUT is now set just where needed. Apparently I forgot to commit this before.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3990 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 11:09:41 +00:00
Giel van Schijndel e572024e84 Update ignore list for po/
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3989 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 10:52:52 +00:00
Giel van Schijndel 33216b2e9d Move all stuff that actually belongs in CPPFLAGS (but is called CFLAGS) to AM_CPPFLAGS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3988 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 10:50:58 +00:00
Giel van Schijndel 037471b784 Update sqlite3.diff for r3984
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3987 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 10:15:45 +00:00
Dennis Schridde d8409c9819 - Don't define CFLAGS anymore, export WZ_CFLAGS instead, which can be overridden by make commandlines
- Set -DYY_NO_INPUT only in those places where needed
- Add some previously forgotten CFLAGS where needed
- Remove extranous -lintl from WIN32_LIBS
- Remove apparently unnecessary directory from Mac include (png_util doesn't need it either)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3986 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 02:01:46 +00:00
Dennis Schridde 2b482d299f - Always use "locale" as LOCALEDIR on Windows (.mo files go into locale/<LANG>/LC_MESSAGES/warzone2100.mo, subdir in the location of the exe)
- Always use "data" as DATADIR on Windows (previous value was useless, even for non-Windows systems)
- Header cleanup


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3985 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 01:28:16 +00:00
Dennis Schridde 67247633e5 mutexIsNT() is never used -> warning -> error -> I remove it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3984 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 00:59:29 +00:00
Dennis Schridde 9f44219b1c Move addition of CFLAGS from configure.ac to the places they are actually needed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3983 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 20:08:42 +00:00
Giel van Schijndel 0af1927488 Provide two functions (sqlite3_register_physfs_vfs and sqlite3_unregister_physfs_vfs) for registering and unregistering of the PhysicsFS implementation for SQLite's VFS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3982 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 17:04:42 +00:00
Giel van Schijndel 5bf53cd315 Relicense the PhysicsFS implementation of SQLite's (3.5+) VFS to the zlib license to be fully compatible with PhysicsFS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3981 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 17:04:35 +00:00
Giel van Schijndel 61a8df2e32 Remove a variable (psStartStats) that (indirectly) only ever referred itself
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3980 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 17:00:25 +00:00
Per Inge Mathisen ed27352982 Remove unused code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3979 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 16:41:37 +00:00
Giel van Schijndel 031e56a437 Some const correctness
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3978 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 16:24:16 +00:00
Per Inge Mathisen 496b2a73fd game.maxPlayers cleanup - remove unnecessary references.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3977 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 15:45:05 +00:00
Giel van Schijndel f7186877fe Some const correctness
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3976 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 15:20:02 +00:00
Giel van Schijndel 3e231c9f87 Don't use malloc followed by strcpy; use strdup instead
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3975 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 13:26:57 +00:00
Giel van Schijndel 92d34df524 Update the svn:ignore lists for the root dir, src/ and build_tools/autorevision/
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3974 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 12:27:18 +00:00
Giel van Schijndel 9aafb0bdf9 Update the svn:ignore lists for the lib/* directories
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3973 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 12:13:16 +00:00
Giel van Schijndel 93f7fc095a Update the sqlite3.diff for r3971
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3972 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 11:50:43 +00:00
Dennis Schridde 3f67498774 Prevent problem with the definition of DATADIR (wz' configure defines it to a string, what objidl.h does not like, because it uses that name as an identifier).
This also should cut down compilation a bit...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3971 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 11:42:53 +00:00
Per Inge Mathisen 8d2c9939f2 Set max number of effect back to 2500 to improve fireworks. Based on patch by Buginator in patch #994.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3969 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 10:51:26 +00:00
Per Inge Mathisen 2904483187 Cosmetic cleanup of effects.c|h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3968 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 10:43:22 +00:00
Per Inge Mathisen 916435094f Add message to MSVC users about disabled warnings. Patch #995 from Buginator.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3967 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 10:06:05 +00:00
Giel van Schijndel c620910020 Add some SQL VIEWs to extract data in a similar way as how it's stored in the CSV files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3966 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 22:24:26 +00:00
Giel van Schijndel cb470b1697 * Convert the 'structureweapons.txt' stats to the SQLite database
This addresses #2 ( http://trac.wz2100.net/ticket/2 )


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3965 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 21:32:52 +00:00
Giel van Schijndel e4ac82a18a Update comment to mention which table.column is referred by an integer ID value in the structures table
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3964 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 21:10:17 +00:00
Giel van Schijndel e4af0a7735 * Convert the 'structures.txt' stats to the SQLite database
This addresses #2 ( http://trac.wz2100.net/ticket/2 )


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3963 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 21:08:49 +00:00
Giel van Schijndel 30f2e438c0 * Convert the 'sensor.txt' stats to the SQLite database
This addresses #2 ( http://trac.wz2100.net/ticket/2 )


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3962 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 20:54:47 +00:00
Giel van Schijndel e944a82dae * Convert the 'ecm.txt' stats to the SQLite database
This addresses #2 ( http://trac.wz2100.net/ticket/2 )


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3961 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 19:29:20 +00:00
Giel van Schijndel 4cfa907249 * Use NULL where appropriate
* Fix a typo in a column name


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3960 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 19:10:59 +00:00
Giel van Schijndel b221414e8e Convert the 'body.txt' stats to the SQLite database
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3959 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 18:40:07 +00:00
Giel van Schijndel b467d49a2e Fix the MSVC project file for sqlite3; patch by Buginator
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3958 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 18:24:20 +00:00
Giel van Schijndel f940f4624b * Convert the 'construction.txt' stats to the SQLite database
* Fix some comments


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3957 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 16:25:46 +00:00
Giel van Schijndel f55d9ac013 Convert the 'brain.txt' stats to the SQLite database
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3956 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 16:09:20 +00:00
Giel van Schijndel a85ec7ad90 Set svn:eol-style on physfs_vfs.[ch]
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3955 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 15:45:18 +00:00
Giel van Schijndel 84b03f9468 Allow compiling of sqlite3.c by disabling -Wmissing-field-initializers when compiling in lib/sqlite3/
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3954 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 15:26:48 +00:00
Giel van Schijndel ae88c9de7b Fix the Code::Blocks project file so that it compiles properly on GNU/Linux as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3953 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 15:26:41 +00:00
Giel van Schijndel dc79c672e5 Add the PhysicsFS VFS to the Code::Blocks projectfile
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3952 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 14:25:12 +00:00
Giel van Schijndel 9b71eb9821 Add a partially completed SQLite VFS (requires SQLite 3.5+) implementation for PhysicsFS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3951 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-08 14:23:07 +00:00
Dennis Schridde 3858daf4a1 Reset MSVC version from 9 to 8, since otherwise MSVC8 will refuse to load the project files. (bug #11219)
Does MS provide some kind of templating system? Like autotools generate Makefiles from Makefile.am.


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