Commit Graph

4167 Commits (fbd576a3293922f333bc21c6aca9afd6af97f384)

Author SHA1 Message Date
Steven Koenig fbd576a329 English readmes:
* Updated 'Contents of Warzone 2100', 'State of the game' and 'Reporting Bugs'


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5213 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-04 20:03:28 +00:00
Giel van Schijndel 2be33c4286 Use WZ_DECL_UNUSED to squelch warnings about unused parameters in the PhysicsFS SQLite-VFS implementation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5212 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-04 19:50:50 +00:00
Giel van Schijndel 3b4df24942 Use WZ_DECL_UNUSED for the data parameter of debug_callback_win32debug to squelch the warning about it being unused
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5211 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-04 17:50:40 +00:00
Dennis Schridde c29df7dae5 Variable to store default for distributor should not be the applicationdir variable...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5210 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-04 15:20:03 +00:00
Dennis Schridde 8b2859c7e9 A dummy model, useful for testing
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5209 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-01 10:13:36 +00:00
Elio Gubser f8261c6427 beginning with intfac1, it's fairly big atm, because i copied some frontend svg's into
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5208 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-01 06:48:57 +00:00
Dennis Schridde 29d54a0956 Fix order to silence warning
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5207 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-01 01:05:26 +00:00
Dennis Schridde 8836ce7a4b warning: converting of negative value `-0x000000001' to `UDWORD'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5206 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-31 23:17:27 +00:00
Dennis Schridde 2a934b06ce Indention fix and test the stats pointer, too.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5205 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-31 09:42:54 +00:00
Giel van Schijndel 685b5f3338 Prefetch the column numbers for the WEAPON_STATS only once
* Changes O(n * m * l) to O(n + m * l) behaviour


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5204 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-29 10:18:31 +00:00
Giel van Schijndel 747f158b45 Abort (i.e. return false) when failing to find the column's numbers by looking them up using their names
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5203 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-29 10:18:23 +00:00
Giel van Schijndel f7df0848ec * Fetch the column numbers by column name only once for the BASE_STATS and COMP_BASE_STATS parts of every SQL query (rather than once for every result row from a query)
* This replaces O(n * m * l) behaviour with O(n + m * l) behaviour (where n is the amount of rows returned by a query, m the amount of columns resulting from a query and l the average length of each column's name)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5202 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-29 10:18:18 +00:00
Giel van Schijndel 91fc8a3b53 * Change colours for some of the status bars in the mission "completion score screen" to be more "vivid"
* Add a new colour: WZCOL_MENU_SHADOW
  * Use this colour instead of WZCOL_MENU_BACKGROUND to create a "Black shadow"

Closes #11; patch by Buginator


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5201 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-28 22:08:49 +00:00
Giel van Schijndel 388c2f2128 Use ARRAY_SIZE to determine the length of the cheat-code list rather than a NULL pointer at the end of the list (as a form of NUL-termination)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5200 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-28 22:08:34 +00:00
Giel van Schijndel 40831ddb22 * When loading from the SQLite database rely on the column's names rather than on their number/order of appearance
* Use an "inheritance"-like approach when loading the stats and load all BASE_STATS and COMP_BASE_STATS in a single function rather than duplicating it in every loading function (cuts down in 230 lines, whee!)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5199 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-28 20:57:53 +00:00
Giel van Schijndel 19b80a1a6b Make sure to parse `database` __before__ `file` (i.e. group it with other tokens starting with a `d`) to make sure that it gets recognised at all
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5198 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-28 20:55:49 +00:00
Elio Gubser a955be34c5 intfac0.svg done
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5197 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-28 18:40:29 +00:00
Giel van Schijndel c0296aa371 * Apparently the %destructor feature of Bison is implemented differently for 2.1 than it is for 2.3 (or it is broken in 2.1); so don't use it when compiling with Bison 2.1 (leak memory instead)
* Assume __all__ windows builds use Bison 2.1 (this isn't correct, but it's the best I can currently do, as Bison provides no version macros aside from a string macro)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5196 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-27 21:37:54 +00:00
Elio Gubser bab67317cd intfac0.svg almost done
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5195 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-26 20:12:16 +00:00
Elio Gubser fb0ffbc567 made the blue target pointer (when opening with inkscape there is also a circle-version of this pointer outside the border lines, but i'm not proud of it)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5194 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-26 18:44:13 +00:00
Giel van Schijndel 6a648a6573 Update POTFILES.in
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5191 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 20:09:54 +00:00
Giel van Schijndel c8d9336618 Update the Pygments WRF lexer for the changes done to the WRF file format in r5188:5189
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5190 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 20:03:37 +00:00
Giel van Schijndel 1d739ce56b * Pass the table name as well from the .wrf resource file
* "table" will now attempt to load the given resource type from the given table (in the currently opened database)
 * Maintain the current database's name (for error message, etc.)
 * Pass the table name to the database loading functions and use it (in combination with sqlite3_mprintf) to produce the SQL statements


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5189 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 19:38:59 +00:00
Giel van Schijndel 452c167e9a * Add a new resource loading function type: RES_TABLELOAD
* Add two new keywords to the .wrf files: "database" and "table"
  * "database" will cause the given filename to be opened as a database file (using SQLite3)
  * "table" will attempt to load the given resource type from the currently opened database
 * Don't open the database in the file loading functions (src/data.c) anymore; turn them in table loading functions instead (which get the current database passed as a paramter)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5188 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 19:38:53 +00:00
Giel van Schijndel 957889d4b9 * Make the load.*StatsFromDB functions load directly from a database (i.e. they don't need to open themself anymore)
* Open the SQLite3 database in src/data.c before invoking a load.*StatsFromDB function


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5187 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 19:38:38 +00:00
Steven Koenig 99c4e339c6 All readmes:
* Dropped the "GPL" in "Warzone 2100 GPL"

XHTML-readmes:
* Moved ids of anchors containing nothing else to the parent block-level element
* Added information about title and hreflang to outgoing links

CSS-files:
* Corrected stylesheets; now valid and no warnings



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5185 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 15:44:17 +00:00
Giel van Schijndel f6693eebdf Fix a typo strrcat => sstrcat
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5183 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 15:42:02 +00:00
Giel van Schijndel d193dce6f9 * Add a new resource type (for use with .wrf files): DBSENSOR which is similar to SSENSOR, with as difference that instead of a CSV file it specifies an SQLite database file to load from
* Add the code to load sensors from the sensor table of the given database file (function `loadSensorStatsFromDB`)
  * This code will make sure to load the sensor stats-data in a similar manner (i.e. the resulting data in-memory should be the same) to the sensor.txt loading code
 * Use this stats loading implementation on single player


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5182 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 15:41:04 +00:00
Per Inge Mathisen 8419a7008b Use calloc instead of malloc+memset, and make sure we clear the right memory.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5181 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 15:40:56 +00:00
Per Inge Mathisen a5e528ebec Fix radarTexture crash.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5179 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 15:29:10 +00:00
Giel van Schijndel ce7928738f * Add a new resource type (for use with .wrf files): DBECM which is similar to SECM, with as difference that instead of a CSV file it specifies an SQLite database file to load from
* Add the code to load ECM entries from the ecm table of the given database file (function `loadECMStatsFromDB`)
  * This code will make sure to load the ECM stats-data in a similar manner (i.e. the resulting data in-memory should be the same) to the ecm.txt loading code
 * Use this stats loading implementation on single player


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5178 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 14:58:03 +00:00
Per Inge Mathisen d6f0f0da2f Use the same test (NDEBUG vs !DEBUG) in droiddef.h and droid.c for droid debug info.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5177 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 14:52:15 +00:00
Giel van Schijndel 855ec725d4 Use sstrcpy|sstrcat instead of strlcpy|strlcat for manipulation of statically sized strings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5176 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 13:46:49 +00:00
Giel van Schijndel 030d5b455b Use sstrcpy|sstrcat instead of strlcpy|strlcat for manipulation of statically sized strings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5173 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 11:36:20 +00:00
Elio Gubser 3c235cb99f made the circle background
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5172 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 09:36:38 +00:00
Elio Gubser 797050d523 frontend4 finished so far, working on intfac's now. these svg's haven't been optimised yet (lots of unused defs)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5170 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 15:37:05 +00:00
Per Inge Mathisen 8243c4b2fb Fix the infamous eventRemoveContext crash.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5167 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 13:58:26 +00:00
Giel van Schijndel 6254f73329 Remove now useless testcase directory "tests" as its only testcase (t1000: tested level_parser.y) has no code left to test (due to r5163)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5165 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 12:48:26 +00:00
Giel van Schijndel 6a5ee556f6 Revert r4830:
* This should fix a heap corruption introduced with the new level_parser

Closes #9 ( http://trac.wz2100.net/ticket/9 )


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5163 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 12:20:23 +00:00
Dennis Schridde ee4b321199 Largely simplified proj_InFlightIndirect.
Largely simplified proj_InFlightIndirect.
Improved readability while functionality should be roughly the same.
Now this is very similar to the Direct function, except for differences noted.

Additionaly:
Comply to Per's codingstyle: Less spaces for more readability!


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5162 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 09:54:42 +00:00
Dennis Schridde 8918fc2788 Comply to Per's codingstyle: Less spaces for more readability!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5161 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 09:54:33 +00:00
Dennis Schridde 1b1aa8f6a0 Improved structure, better layout and more comments for proj_InFlightDirect
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5160 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 09:54:23 +00:00
Dennis Schridde 55ee376dc2 Ignore .wz files, too
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5159 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 22:55:29 +00:00
Dennis Schridde e7a0a57b0e Simplify buildsystem for base.wz/mp.wz and make sure to really regenerate the archives.
This would not always work before, since we just depend on the directory, not each file in it.
This oversight made make not recognize when a file was changed and the archive needs to be regenerated.
We now run zip on every invocation of the data target.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5158 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 22:01:07 +00:00
Dennis Schridde 976240b528 Fix raw makefile dep
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5157 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 21:50:40 +00:00
Dennis Schridde 85ab4e02e9 Move base files from data/ into data/base/ (and stuff from warzone.wz to base.wz respecitively).
Should not create any problems, buildsystems were changed (MacOSX, please test).
Reason: Organisation, later: simplification.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5156 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 21:42:44 +00:00
Roman C d24c8d0eb3 Aivolution: prevent division by zero, this hopefully fixes bug #11725.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5154 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 19:04:42 +00:00
Roman C d89f43106d Make sure we print out script call stack when division by zero occurs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5152 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 14:29:11 +00:00
Dennis Schridde 0d61fb663f Use direct initialisation, since this is easier here.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5151 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 11:03:03 +00:00
Per Inge Mathisen c95da57404 Remove unused WATER_ALPHA_LEVEL define. Alpha channel for water is defined in the tiles.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5149 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-22 20:22:48 +00:00