Commit graph

965 commits

Author SHA1 Message Date
Enno Rehling
305942414c Fixing new factions 2007-12-09 13:56:13 +00:00
Enno Rehling
b1a42adbeb umlauts removed from output 2007-12-08 16:33:38 +00:00
Enno Rehling
09a08fb84a fixing the item use functions and making future fuckups less likely 2007-12-03 19:26:17 +00:00
Enno Rehling
d6cce4fb40 converting output to stdio for windows CP1252 2007-10-28 23:13:46 +00:00
Enno Rehling
81de21fcb8 Cache Optimizations:
- do prepare_reports simultaneously
- make battle-sides more cache-local
- avoid dereferencing bfaction for the faction
- avoid dereferencing side for the index
2007-10-27 15:09:36 +00:00
Enno Rehling
4cffa0400f http://eressea.upb.de/mantis/view.php?id=1283
"Liste aller Adressen übersichtlicher gestalten"
- improved address list a little
2007-10-14 21:23:14 +00:00
Enno Rehling
7531de4645 http://eressea.upb.de/mantis/view.php?id=1285
""rundenweise" Kampfzauber und Postkampfzauber werden zu Beginn des Kampfes ausgeführt/angezeigt"

- order of uncategorized messages should be linear.
- cleaning and speeding some code.
2007-10-14 19:55:06 +00:00
Enno Rehling
a79d40a91f removing the naming confusion between elven horse and unicorn in the source 2007-10-12 22:14:01 +00:00
Enno Rehling
f8398db851 - compiling in VS2005 on my new PC
- eliminating a couple of warnings
- fixed a crash bug or two in the -x option
- fixed an endless loop in give_item
2007-10-11 21:48:31 +00:00
Enno Rehling
bfc801b6b7 http://eressea.upb.de/mantis/view.php?id=1275
"Pferde verschwinden nach GIB 0"
fixed the give_horses function being used.
2007-09-21 23:49:39 +00:00
Enno Rehling
7e3c531436 unicode function to convert latin1->utf8 2007-09-16 15:34:49 +00:00
Enno Rehling
8e91392ed7 some spell syntax definitions fixed 2007-09-10 09:39:23 +00:00
Enno Rehling
7de422f976 i18n of spell-syntax (removing fixed syntax text and replacing with a localizable function) 2007-09-10 06:51:11 +00:00
Enno Rehling
ef2f892d8a - i18n for unit_dissolve messages 2007-09-03 19:52:51 +00:00
Enno Rehling
dd378fc8e8 - i18n for ravaged regions. 2007-09-02 19:06:21 +00:00
Enno Rehling
79dc9acf5f - fixing race prefixes
- fixing some latin1 loading
- improved the spell-syntax writer
- replaced my email address
2007-09-02 18:11:17 +00:00
Enno Rehling
ebec08fa01 Some more English localization. 2007-09-02 08:56:07 +00:00
Enno Rehling
d434b73617 - resizing buffer in battle.
- not writing past-the-end in orders.
- fix for show_allies.
2007-09-02 07:57:31 +00:00
Enno Rehling
a1865ee2fa - Undo modifications to strlcpy from rev 3631
- Many more warnings when buffers too small.
2007-09-01 23:40:58 +00:00
Enno Rehling
28fa9e5d81 - bugfixes for snprintf, warnings for overflowing static buffers
- some English messages
2007-09-01 21:52:13 +00:00
Enno Rehling
c3283925b6 Unicode QA:
- irritating comma in HELP status- 
- localized roads in NR
- new function for trails
- lua fix get_resource(horse)
2007-08-28 06:19:31 +00:00
Enno Rehling
a33d59b21a Unicode WIP:
This code did a full run of turn 531, with all reports.

- replace all calls to strlcat with strlcpy
- change strlcpy to return number of bytes written, not input bytes
- fix some buffer sizes
- write UTF8 BOM into all output files that could use them.
2007-08-21 07:04:44 +00:00
Enno Rehling
c3a5631ec7 fixed a couple of the strlcpy calls 2007-08-20 16:32:27 +00:00
Enno Rehling
b132ffdd2b Unicode WIP:
- links on Linux (Jamfile changes)
- bugfix latin1/newfactions file
2007-08-19 20:40:42 +00:00
Enno Rehling
8fbb513b63 Unicode WIP:
- NR is being written
- NR and Template get a UTF8 BOM

I'm running out of ideas. I must be nearly ready.
2007-08-19 17:30:40 +00:00
Enno Rehling
28921d4e3d Unicode WIP: we're compiling on Linux 2007-08-18 14:54:35 +00:00
Enno Rehling
4e863e9059 Bugfixes uebertragen aus Hauptbranch:
http://eressea.upb.de/mantis/view.php?id=1251
"Komische Fehlermeldung bei abtreibendem Schiff"

http://eressea.upb.de/mantis/view.php?id=1256
"Feinde können Schiff verlassen und sich bewegen in bewachter Region"

http://eressea.upb.de/mantis/view.php?id=1252
Klarere Fehlermeldung bei Bewachung/Bewegung

http://eressea.upb.de/mantis/view.php?id=1248
"schaffenstrunk und gehirnschmalz ohne wirkung"
2007-08-17 07:06:33 +00:00
Enno Rehling
cae7e67fdf Unicode WIP
- Bugfix region::connect structure not initialized
- set encoding from Lua
2007-08-16 06:53:00 +00:00
Enno Rehling
67184b0c96 Unicode WIP:
- building name changes
- locale optimization
- fixing some error messages
2007-08-13 07:29:39 +00:00
Enno Rehling
77bb331bc5 Unicode WIP:
some message-fixes, building types that had been broken since forever, small stuff
2007-08-12 13:56:59 +00:00
Enno Rehling
d4d6776b50 Unicode WIP, backward compat:
- latin1 reader for datafile
- latin1 reader for orders

a number of minor conversion bugs fixed, this version can now run a turn and write reports, it seems.
2007-08-12 09:51:26 +00:00
Enno Rehling
b837248601 !this commit does not compile!
Unicode WIP:
- removed xmlChar and returned everything to char * again, now that conversion is complete.
- added option to specify orderfile and daatafile encoding in .ini file

currently: implementing reading of latin1 datafiles for backward compatibility
2007-08-10 07:03:23 +00:00
Enno Rehling
6acb1e22c5 - fixed the summary.c
- implemented unicode_utf8_strcasecmp function
- fixed some xml files
- code compiles and runs on the console

TODO:
* switch from xmlChar to char again
* eliminate remaining warnings
* report.[hc] are still disabled

OPTIONAL:
* handle latin1 input?
2007-08-09 06:42:37 +00:00
Enno Rehling
940d236edc - filereader.c rewritten since the initial implementation is in the moving van.
- moved some summary functionality (emails, aliases) to Lua code
- made default.lua an include for all the different run-scripts

report.c is the last file that needs some work, everything else should be fine. Most importantly, all the messages are not internationalized, so that means just about no more German in the code. Yay!
2007-08-08 07:43:24 +00:00
Enno Rehling
f013ead006 removing old visual studio files 2007-08-05 12:28:15 +00:00
Enno Rehling
8e897d29be movement.h -> move.h 2007-08-05 12:26:46 +00:00
Enno Rehling
55e0656250 unicode branch gets premake 2007-08-05 12:19:56 +00:00
Enno Rehling
376172adcd Unicode WIP:
- sinking ships i18n
2007-07-23 19:36:43 +00:00
Enno Rehling
e63c3dc4a1 Unicode WIP:
- creport.c compiles
2007-07-22 09:31:39 +00:00
Enno Rehling
7031e9d032 Unicode WIP:
- a lot of set_string calls replaced.

Now I mostly have to work on the report-writing code and this is done.
2007-07-21 15:35:07 +00:00
Enno Rehling
d2094d6205 Unicode WIP:
- completed i18n for combatspells and battle
adding the filereader header (the implementation is on my PC which is still in transit to Germany)
2007-07-20 07:28:11 +00:00
Enno Rehling
d48d8ec348 Unicode WIP:
- Visual C++ 2005 project files
- Savegames
- i18n for many more spells
2007-07-17 15:33:48 +00:00
Enno Rehling
b2cbb1234b Unicode WIP, does not compile.
- finishing for today. Spells still need work, the error-messages need translation.
2007-06-28 00:39:55 +00:00
Enno Rehling
1637950201 Started converting the naming-functions (iso-8859-1 constants must be removed from code). it's stupid monkey labour. 2007-06-27 23:32:24 +00:00
Enno Rehling
857df3f300 Unicode WIP, does not compile.
- removed a lot more localized text.- currently working on combatspells (buf usage and German text removal)
2007-06-27 20:39:49 +00:00
Enno Rehling
588c136071 Unicode WIP, does not compile.
- finishing for today, several more files compile.
2007-06-27 00:54:54 +00:00
Enno Rehling
39ce1bd0dd Unicode WIP, does not compile.
- xmlStr functions have bad signatures, replacing them with defines in config.h
- more removal of buf[] usage
2007-06-27 00:08:46 +00:00
Enno Rehling
ea07884657 Unicode WIP, does not compile.
- monsters use create_order instead of parse_order because that means less use of sprintf and buf[].
- rename drachen_name to dragon_name.
2007-06-26 21:50:07 +00:00
Enno Rehling
260d518fa1 WIP, does not compile: Unicode (UTF8) conversion of absolutely everything. Mi'kmaq hieroglyphic writing FTW! 2007-06-26 09:32:28 +00:00
Enno Rehling
fd7ddc2e2a old copy/paste bug 2007-06-26 01:42:43 +00:00
Enno Rehling
25cd0e4b66 added an option to have certain races supply a description without a need to
set u->display everywhere. This was costing 24 MB of memory just for the
braineaters alone, a terrible waste.
2007-06-25 01:50:34 +00:00
Enno Rehling
32a3c0103f The synonym attribute was not in use, and relied on the old race_t type to
idntify races. It is better to use racename-attributes for this, I think.
2007-06-24 14:04:42 +00:00
Enno Rehling
1729f137de charset-angabe im CR (always IDO-8859-1 right now) 2007-06-24 12:51:16 +00:00
Enno Rehling
a5b7b13a6d Cleanup: Removing parser-code from kernel/eressea.[hc] and putting it into
separate parser files in util/
2007-06-21 22:31:28 +00:00
Enno Rehling
1a2c3942f1 Moving all item definitions to XML where they belong. 2007-06-20 18:15:29 +00:00
Enno Rehling
96a2b1c779 Include cleanup. 2007-06-20 00:34:02 +00:00
Enno Rehling
29cfece1f3 http://eressea.upb.de/mantis/view.php?id=1195
"Welche Sprache spricht mein Gegenüber"

Info für andere Parteien jetzt auch im CR.
2007-06-07 20:41:13 +00:00
Enno Rehling
9f86a467b7 compile fixes 2007-05-30 01:23:21 +00:00
Enno Rehling
7233af54b4 Simple allow/deny style restrictions for archetypes (let only humans recruit gamedesigners, etc).
These need to be more powerful to be useful, and the current way they are implemented is not, but the general idea strikes me as good.

Also, feedback should be configurable for each failed rule.
2007-05-30 01:21:09 +00:00
Enno Rehling
0ebf9e3187 RTS/Archetypes (WIP):
- message and locale-fixes
2007-05-28 21:10:59 +00:00
Enno Rehling
5ca0e5cd8a simplified sue of localized parameter-strings in messages 2007-05-28 20:04:42 +00:00
Enno Rehling
54446e0a1e RTS/Archetypes (WIP):
- tested and fixed archetype-recruiting
2007-05-28 19:45:08 +00:00
Enno Rehling
2651973059 RTS/Archetypes (WIP):
- equipment for new factions
- game gets a calendar
2007-05-28 17:52:24 +00:00
Enno Rehling
0711b51cfe min/max confusion. again. 2007-05-28 17:32:15 +00:00
Enno Rehling
c1ba34a268 archetype-recruiting can be limited by building-size 2007-05-28 17:31:40 +00:00
Enno Rehling
b27da8c056 Archetypes (WIP): "RECRUIT 15 knight"
creates XML-configurable pre-skilled units for game variants with faster reinforcements.
Speeding up locale-string lookup a little bit, and making it more unified for different classes of strings (so new ones are easily added).
2007-05-28 16:03:48 +00:00
Enno Rehling
27110e7e26 http://eressea.upb.de/mantis/view.php?id=1191
- trying another peasant migration algorithm

also:
- battle log optional (debug = 0 in the .ini file)
2007-05-27 21:20:06 +00:00
Enno Rehling
1ca7075c09 NEW_MIGRATION define is obsolete 2007-05-27 20:13:47 +00:00
Enno Rehling
dfc89b163d http://eressea.upb.de/mantis/view.php?id=1189
"Kein Anpflanzen von Kräutern"

Bessere Fehlermeldungen fuer PFLANZE/ZUECHTE, und beide Funktionen zu einer zusammengefuehrt.
2007-05-22 17:09:23 +00:00
Enno Rehling
74de05a4d3 http://eressea.upb.de/mantis/view.php?id=1178
"Boot und Kueste"

localization of ", " returns "and"? weird.
2007-04-27 11:31:02 +00:00
Enno Rehling
668809b9c2 Beautification: New English texts, some NR fixes. 2007-04-22 12:45:54 +00:00
Enno Rehling
af0a7b225a curse-flags funktionieren jetzt anders, und koennen per curse-type gesetzt werden so dass der spell es nicht tun muss, aber dann vom spell ueberschrieben werden (passiert per XOR). 2007-04-21 23:04:24 +00:00
Enno Rehling
8d804fecdb unintentional comma operator 2007-04-19 15:14:52 +00:00
Enno Rehling
cb65679573 zuviel entfernt 2007-04-15 10:42:26 +00:00
Enno Rehling
f227f1a7b1 Deutsche Rechtschreibung: Pluralbildung von Abkuerzungen gibt es nicht. 2007-04-15 10:38:34 +00:00
Enno Rehling
72d0596bec strcmp() bugfixes 2007-04-15 08:01:12 +00:00
Enno Rehling
6283910959 - Fehlermeldungen ueber fehlende item-infos und Rasseninfos entfernt
- Falsche Rasseninfos (Attacken) aus strings.xml entfernt
2007-04-08 08:24:09 +00:00
Enno Rehling
d57e6724d1 http://eressea.upb.de/mantis/view.php?id=1170
Translating the familiar-description and moving some part to documentation.
2007-04-08 07:43:39 +00:00
Enno Rehling
c95342a88b cleaning up in the magic code a little, and making the actual casting a separate function for easier debugging. 2007-03-25 18:37:28 +00:00
Enno Rehling
64fa29f9df http://eressea.upb.de/mantis/view.php?id=1162
"BENENNE und BESCHREIBE bei TEMP-Einheiten funktioniert nicht"

Die neue generalisierte Logik hat zugeschlagen :-(

Ausserdem wieder eine Reihe englischer Uebersetzungen.
Issue: 1162
2007-03-25 09:52:23 +00:00
Enno Rehling
c722a382a2 Generalisierung der Tests fuer lange Befehle, (Insekten, Meermenschen auf See usw.) damit ich die nicht ueberall vergesse. 2007-03-25 00:04:40 +00:00
Enno Rehling
eb1d2373e8 http://eressea.upb.de/mantis/view.php?id=1157
"Menschen reparieren Schiffe auf See"

lange befehle sind auf see nicht erlaubt.
2007-03-24 23:06:55 +00:00
Enno Rehling
4ea302940f http://eressea.upb.de/mantis/view.php?id=1151
"Einheit konnte sich nach Kampf nicht bewegen"

Die KAEMPFE FLIEHE logik hat drauf vertraut, das movement nur nach UFL_NOTMOVING schaut, nicht nach LONGACTION. dafuer muss aber eine Menge getan werden, das nicht wurde. Jetzt aber...
2007-03-11 22:18:58 +00:00
Enno Rehling
e9feec08ba Routine fuer "Teure Fremde" hat auch Untote korrigiert. 2007-03-11 20:52:09 +00:00
Enno Rehling
349f6f9828 http://eressea.upb.de/mantis/view.php?id=1146
"Astraler Ruf findet Einheiten nicht"

Kosmetischer Fix.

Ausserdem:
- Schiffsbeschleunigung auf Englisch
- less verbose on the monster spawns
2007-03-11 14:03:41 +00:00
Enno Rehling
41a9ffb7b3 compile fixes, report fixes 2007-03-09 23:38:13 +00:00
Enno Rehling
1030e44c07 - All the cinfo_* functions will now return a message * object, which is nicer than using buf[].
- Some English translation.
2007-03-09 21:30:00 +00:00
Enno Rehling
da224f6670 Cleanup in cinfo_ code, although I would prefer that it doesn't write into buf but returns a message *. sometime later. 2007-03-07 22:38:04 +00:00
Enno Rehling
68e2ec932f http://eressea.upb.de/mantis/view.php?id=1149
"Ozean wird im CR zum Regionstyp Mahlstrom, verliert im CR aber seinen Namen"

Maelstrom wird jetzt programmatisch in terrain_name gemacht (auch wenn es besser in terrain::name() sein sollte).
2007-03-04 22:27:32 +00:00
Enno Rehling
07ecc3e517 calling getplane() and rplane() is a real waste of cycles (and happens enough to shortcut it) 2007-03-01 21:51:35 +00:00
Enno Rehling
546d3a2e1d sleep/retry when errno during report writing, small fix 2007-02-25 11:52:56 +00:00
Enno Rehling
9762287e2e Adressen ausgeben, ncith Todesmeldung 2007-02-25 08:58:01 +00:00
Enno Rehling
61a479ad3f More English translations for spells and other parts of the code (addmessage replacements FTW) 2007-02-23 21:18:35 +00:00
Enno Rehling
3567e3f783 http://eressea.upb.de/mantis/view.php?id=1141
"Partei fehlt im Report"

Behandlung von Turmregionen. Hoffentlich richtig.
2007-02-21 19:59:27 +00:00
Enno Rehling
bbe226e22e http://eressea.upb.de/mantis/view.php?id=1130
"Schattendämonen/-meister"

Es gibt ein neues Rassen-flag, dass das betreten von Schiffen fuer eine Rasse unterbindet. Wird eingesetzt fuer SD/SM.
2007-02-17 12:51:40 +00:00
Enno Rehling
96302d39b4 http://eressea.upb.de/mantis/view.php?id=1130
"Schattendämonen/-meister"

Es gibt ein neues Rassen-flag, dass das bestehelen fuer eine Rasse unterbindet. Wird eingesetzt fuer SD/SM.

Ausserdem: Eine Menge falsch gesetzter XML-tags repariert
2007-02-17 12:34:07 +00:00
Enno Rehling
88b041880c The power of 2, faster. 2007-02-12 23:08:32 +00:00
Enno Rehling
8077027b42 Kein guard setzen fuer TEMP-Einheiten 2007-02-12 23:07:55 +00:00
Enno Rehling
c61127ab6f SIMPLE_ESCAPE: Flucht verhindert BEWACHE. 2007-02-12 07:27:04 +00:00
Enno Rehling
aa32666264 http://eressea.upb.de/mantis/view.php?id=1040
"Chaossoge eventuell nicht funktionsfähig?"

Doppeltes ageing bei Regions-Attributen, aua.
2007-02-11 23:00:06 +00:00