Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,136 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

3058 Commits

Author SHA1 Message Date
Enno Rehling 3c170be6b5 xmllint 2008-06-04 23:14:54 +00:00
Enno Rehling 3b9d951556 asgard rules: 
- creating xml definitions
- creating separate lua files
- added option to make work automatic
 2008-06-04 23:12:05 +00:00
Enno Rehling a5d17f6c24 http://bugs.eressea.de/view.php?id=1438 
"FOLGEnde Einheiten reiten, können aber nicht folgen"
- fixed a bug in reporting travelthru that was caused by that fix
Issue: 1438
 2008-06-04 16:18:53 +00:00
Enno Rehling 310fa1e3f2 http://bugs.eressea.de/view.php?id=1438 
"FOLGEnde Einheiten reiten, können aber nicht folgen"
when a unit couldn't keep up, all furhter followers would not travel the entire route. more const ftw
Issue: 1438
 2008-06-04 14:40:20 +00:00
Enno Rehling a63cd86e44 ium 2008-06-03 11:21:39 +00:00
Enno Rehling d75ae59e96 internal rename diamond->adamantium before it's too late. 2008-06-03 10:58:06 +00:00
Enno Rehling 15971fdb98 fixing find_key. ouch! 2008-06-03 10:16:55 +00:00
Enno Rehling 09478956c8 http://eressea.upb.de/mantis/view.php?id=1437 
"Zeilenumbruch im Einheitennamen"
- apply fixes to existing data.
 2008-06-03 07:42:06 +00:00
Enno Rehling e26700c8b1 http://eressea.upb.de/mantis/view.php?id=1437 
"Zeilenumbruch im Einheitennamen"
- prevented line breaks in unit names

http://eressea.upb.de/mantis/view.php?id=1436
"lc_age throws an exception"
- fixed adding tostring() in script.
- not calling std::terminate

also:
- added AT_AGE_* macros to be returned from attrib-age functions
 2008-06-03 07:28:32 +00:00
Enno Rehling b973330061 show region id in mapper 2008-06-02 11:12:22 +00:00
Enno Rehling 0326ffe7fe - fixed not putting regions next to firewall 2008-06-02 10:34:58 +00:00
Enno Rehling 5f3bfa3a2c autoseed should not find old islands that are de-populated. 2008-06-02 10:06:25 +00:00
Enno Rehling 689dedae6d - equipment for new factions defined in xml, not lua. 
- added possibility to give equipment to factions, not only the first unit
- 4 adamantine for new factions
- removed obsolete SHORTPWDS define
 2008-06-02 09:16:58 +00:00
Enno Rehling 4035d153e7 http://eressea.upb.de/mantis/view.php?id=1434 
"Teilweise fehlende RESOURCE-Blöcke"
- fixed. was not writing the buffer it was going to. added comments.
 2008-06-01 18:58:51 +00:00
Enno Rehling fc770832d4 disabling building-aging for the moment 2008-05-30 21:56:12 +00:00
Enno Rehling 3a1550c3f6 must return a value 2008-05-30 21:33:19 +00:00
Enno Rehling 055c9f4bb9 missing translation 2008-05-30 21:29:31 +00:00
Enno Rehling 153766ab70 some debug output while this is new 2008-05-30 21:09:19 +00:00
Enno Rehling 8656b2323b implementation of adamant and tunnels 2008-05-30 21:01:25 +00:00
Enno Rehling a473991f67 another crash 2008-05-30 16:21:21 +00:00
Enno Rehling f8a21ec386 fix include 2008-05-30 16:09:10 +00:00
Enno Rehling 47989da257 crashfix mapper 
Lua: get_region_by_id
 2008-05-30 16:08:35 +00:00
Enno Rehling ae68d8fd79 Adamant + Rüstung 2008-05-30 15:28:20 +00:00
Enno Rehling ecc147425b some cleanup in the creport 2008-05-28 08:42:45 +00:00
Enno Rehling a761c686cd - Fixed assigning r->uid to regions that haven't got one 
- restarted implementation of xml report
 2008-05-28 00:23:46 +00:00
Enno Rehling 7cb18e90ea http://eressea.upb.de/mantis/view.php?id=1408 
"Zauberpatzer - Effektmeldung"
- fixed positive message should be negative
- fixed ct_find
- fixed a few places not checking u->number or u->region
- speeding up pool when units have no items.
 2008-05-27 22:03:57 +00:00
Enno Rehling f54037295a compat fixes for old datafiles (turn 287) 2008-05-27 09:21:56 +00:00
Enno Rehling 363c2e0d5b support for old item 2008-05-27 07:59:23 +00:00
Enno Rehling 577601f912 support code for reading data files with old curses 2008-05-27 07:58:04 +00:00
Enno Rehling 43b0ff2ce3 removing code for old versions that we no longer have datafiles for (pre-287) 2008-05-27 07:30:04 +00:00
Enno Rehling ad240fecc0 floating point rules to ensure same output with release and debug 2008-05-25 23:17:39 +00:00
Enno Rehling 3e9c0c894a rng-fix. is this it? cannot be. 2008-05-25 19:29:46 +00:00
Enno Rehling 77d72ba482 search for the heisenbug 2008-05-25 10:37:19 +00:00
Enno Rehling 18485ee6f1 not writing aliases for monsters should make things go faster 2008-05-25 09:34:57 +00:00
Enno Rehling 57623bb2a7 missing ifdef 2008-05-25 09:33:27 +00:00
Enno Rehling ae7eefa47c some cleaning 2008-05-25 09:29:06 +00:00
Enno Rehling 94ae1a1c7c -march switch 2008-05-25 00:34:24 +00:00
Enno Rehling f051b5576f fix some crashes when attributes refer to a unit that is dead. 2008-05-24 23:26:44 +00:00
Enno Rehling 3a476bb279 stupid assert needs a fix 2008-05-24 18:29:27 +00:00
Enno Rehling fe841cd3c0 fixing crashes from triggers 2008-05-24 17:38:38 +00:00
Enno Rehling 4988d0f425 fixing killunit (triggering dead units) 2008-05-24 17:34:55 +00:00
Enno Rehling 32097e56cb remove_unit is a dangerous thing. 2008-05-24 17:15:52 +00:00
Enno Rehling fec171d75f - vset, vmap and graph are obsolete 
- LASTORDER define is dead
 2008-05-24 16:15:31 +00:00
Enno Rehling 4793d0fd34 more tests 2008-05-24 13:38:18 +00:00
Enno Rehling 8a48d9323f another optimization to the binarystore (ids stored as variable-length) 2008-05-24 01:48:08 +00:00
Enno Rehling 186a575c7c http://eressea.upb.de/mantis/view.php?id=1432 
"Der strict-aliasing fix zerstoert Referenzen"
- mostly rewrote the whole delayed resolution code.

http://eressea.upb.de/mantis/view.php?id=1431
"buildings and ships are leaking memory"
- made a mistake deleting damaged ships.

also:
- WORMHOLE_MODULE is now a config option
 2008-05-24 00:20:00 +00:00
Enno Rehling 0ce94f0f91 http://eressea.upb.de/mantis/view.php?id=1431 
"buildings and ships are leaking memory"
- fixed a small bug
 2008-05-23 10:14:58 +00:00
Enno Rehling 739dd98755 using hse data. 2008-05-23 09:52:43 +00:00
Enno Rehling f0c56346d9 http://eressea.upb.de/mantis/view.php?id=1431 
"buildings and ships are leaking memory"
- remove_building and remove_ship work like their region/unit counterparts
 2008-05-23 09:25:41 +00:00
Enno Rehling 43d73a6b45 - free_gamedata() is perfect. 
- we can now save region uids for references, not x,y
 2008-05-22 22:55:29 +00:00
Enno Rehling b9fbf06614 - clear uidhash 2008-05-22 22:15:55 +00:00
Enno Rehling 3391b3bb7a - fix warning 
- initialize global.cookie properly
 2008-05-22 21:56:55 +00:00
Enno Rehling 88ce120991 it is not a good idea to use the turn to check whether the gamedata has changed. we use a cookie instead that is different each time we load. 2008-05-22 21:44:23 +00:00
Enno Rehling 644d0d9a4a implementing free_gamedata(): 
- fixed freeing of borders
- fixed freeing of global.attribs
- more static-variable reinitialization
- reseting the RNG

removed border.attribs:
- new savegame-version
 2008-05-22 14:40:21 +00:00
Enno Rehling 1052e46613 http://eressea.upb.de/mantis/view.php?id=1429 
- made startup regions more balanced

implementing free_gamedata():
- cleaning up some static variables
 2008-05-22 10:46:02 +00:00
Enno Rehling a40e5a3711 some more static keywords 2008-05-22 07:37:17 +00:00
Enno Rehling fef83c4df5 the mapper is no longer maintained 2008-05-20 21:17:02 +00:00
Enno Rehling ede420cd3b it's enough to let fix_astralplane do the thick fog, no need to have it in 
create_teleport_plane (and it didn't work, either)
 2008-05-20 19:58:23 +00:00
Enno Rehling 67c43c6ed2 fixing astral space properly 2008-05-20 15:38:50 +00:00
Enno Rehling 5d4c66762b test for FORBIDDEN_REGION moved out of standard-to-astral function, becasue that annoys the editor. 2008-05-20 15:15:02 +00:00
Enno Rehling 390bf522f7 http://eressea.upb.de/mantis/view.php?id=1428 
- there are no roads in astral space
 2008-05-20 14:28:31 +00:00
Enno Rehling 66d7cc0fdf http://eressea.upb.de/mantis/view.php?id=1412 
"keine zauberwirkung trotz korrektem befehl "
- added a message when number of ships cursed < wanted
 2008-05-20 10:03:23 +00:00
Enno Rehling ad14e45341 http://eressea.upb.de/mantis/view.php?id=1427 
"Angegriffene Einheiten auf Schiffen an Land fliehen nicht"

Also:
- printing the monster faction in reports
 2008-05-20 08:39:56 +00:00
Enno Rehling dcf7166973 local fixes 2008-05-18 14:38:12 +00:00
Enno Rehling 9e902c3456 more editor selection functions, because i'm too lazy to expose the keystrokes to Lua 2008-05-18 14:31:08 +00:00
Enno Rehling 8452dc365e - removing planes 
- removing units and regions more cleanly
- dying units won't give items to undead or others who don't want/won't return them
- removed old "nogive" attribute for races.
 2008-05-18 13:46:18 +00:00
Enno Rehling 78520fb9bf is_monsters() test for skeletons & al 2008-05-18 08:21:00 +00:00
Enno Rehling d442616681 that old fix died sometime around revision 800. 2008-05-17 15:48:27 +00:00
Enno Rehling 599fa82a27 http://eressea.upb.de/mantis/view.php?id=1411 
"Server does not compile with -fstrict-aliasing"
- fixed all the aliasing-issues that gcc reported.
 2008-05-17 15:21:17 +00:00
Enno Rehling 2b913dc9e1 http://eressea.upb.de/mantis/view.php?id=1392 
"Störe Astrale Integrität ohne Stufenwirkung"
- made spell work with level
 2008-05-16 23:48:50 +00:00
Enno Rehling 55f6b43fbc http://eressea.upb.de/mantis/view.php?id=1396 
"Berechnung des Belagerungsschadens merkwürdig"
- cosmetic changes to siege messages.
 2008-05-16 22:58:34 +00:00
Enno Rehling d0022db79a Data format change reflects that id 0 is now illegal (so we use that instead of -1) 2008-05-16 22:37:13 +00:00
Enno Rehling 5b5fc0063c small fix to the guard-caching 2008-05-16 19:48:06 +00:00
Enno Rehling 5bd67a6d2a fix warnings 2008-05-16 17:21:43 +00:00
Enno Rehling 1b93b094e4 - make monster-equipment configurable 
- rename some SK_ constants to match their name
 2008-05-16 17:17:10 +00:00
Enno Rehling 78615978c8 The rule of "no more than 5 weeks difference per island" gets coded in a smarter way. No longer creating new island every 5 turns, but actually checking the island. 2008-05-16 16:32:13 +00:00
Enno Rehling 47327786a2 allow mapper to be opened twice 2008-05-16 08:36:45 +00:00
Enno Rehling 422213f369 removing obsolete strings 2008-05-16 08:19:47 +00:00
Enno Rehling 397ab6975b treating firewalls with more respect when seeding new players. 2008-05-16 08:06:39 +00:00
Enno Rehling 4afcf145f5 - remove the "confusion" spells because they do not work. 2008-05-13 20:22:31 +00:00
Enno Rehling 474431fb0d - prevent enslaved units from FORGET 
- prevent promotion of foreign races
- prevent charming of units with limited skills

also:
- rename teure_talente to has_limited_skills
- move frame_regions to autoseed.c
- some output for korrektur.c
 2008-05-13 16:47:54 +00:00
Enno Rehling 76497abc92 bugfix monsterfaction 2008-05-12 09:44:01 +00:00
Enno Rehling dcf3292467 defining NPC-factions with a flag instead of MONSTER_FACTION. 2008-05-11 22:51:34 +00:00
Enno Rehling 478ee8d153 Lua: faction:renumber_faction(no) 
gmtool: save as binary
 2008-05-11 22:20:03 +00:00
Enno Rehling dd85b9b6a0 http://eressea.upb.de/mantis/view.php?id=1419 
MACHE mit Gebaeude in dem man steht.
 2008-05-11 22:01:48 +00:00
Enno Rehling 0c47aab8a2 http://eressea.upb.de/mantis/view.php?id=1421 
- combatspells with level 0 are lost
 2008-05-11 21:50:26 +00:00
Enno Rehling 0af00c10ec making init_battle a bit faster by being a bit smarter. 2008-05-05 16:08:46 +00:00
Enno Rehling 2df1fbf0e9 fixed some errors from eressea.log 2008-05-04 07:49:48 +00:00
Enno Rehling 111051a580 http://eressea.upb.de/mantis/view.php?id=1401 
"Übergaben haben teilweise geklappt trotz fehlendem helfestatus"
 2008-05-04 06:44:07 +00:00
Enno Rehling d7be4a21c2 - started MONSTER_FACTION->is_monsters() 
http://eressea.upb.de/mantis/view.php?id=1418
- fixed toads
 2008-05-04 05:57:34 +00:00
Enno Rehling cdd1709ee3 do not quote the id 2008-04-30 08:47:52 +00:00
Enno Rehling 3a5873a0f6 Kompatibilitaets-Fix negative ids. 2008-04-27 11:58:14 +00:00
Enno Rehling ddcbce5092 warnings about parentheses 2008-04-27 09:59:27 +00:00
Enno Rehling c05aad1b14 - binary storage uses packed int 
- creport: disabled writing of r->uid
- creport: fixed missing quotes
 2008-04-27 09:52:03 +00:00
Enno Rehling 256d0b1d4b fixing strdup(NULL) call 2008-04-26 23:04:37 +00:00
Enno Rehling 93091caff0 - optimized is_guardian 
- realized the optimization can be done further up. doh.
 2008-04-26 21:39:09 +00:00
Enno Rehling 371409e943 - prevent empty "private" attribute 
- remove the HEROES define. Code works.
 2008-04-26 18:55:58 +00:00
Enno Rehling aaf8668257 fixes duplicate planes (again) 2008-04-26 16:48:50 +00:00
Enno Rehling 77b292e05a compilation fixes GCC. 2008-04-26 16:46:05 +00:00
Enno Rehling 43422a0619 fix for duplicate astral plane 2008-04-26 16:45:39 +00:00
Enno Rehling bc5fa11611 - made a storage class that wraps disk i/o for data files 
- recreated old behaviour in text_storage class
- built binary_storage class: saves 60% of load time, adds 20% to file size.

next: gzip & others?
 2008-04-26 14:55:22 +00:00
Enno Rehling 43f00be173 ptries are disabled again 2008-04-25 15:46:39 +00:00
Enno Rehling 4364f25952 jamfile fixed 2008-04-25 14:32:07 +00:00
Enno Rehling 1dd05538ad - added a testsuite 
- testcase skill-parser
- findskill uses patricia
 2008-04-25 14:31:38 +00:00
Enno Rehling a2abcfe177 more intelligent values for hashtable sizes. 2008-04-24 18:14:14 +00:00
Enno Rehling 23505d2b84 Slightly more cache-friendly hashing (WIP) 2008-04-24 01:37:47 +00:00
Enno Rehling 34edc042bc mremap only if __USE_GNU 2008-04-24 01:17:11 +00:00
Enno Rehling db0d1f8948 fixed compilation warnings caused by DLMALLOC 2008-04-24 01:13:47 +00:00
Enno Rehling fde26f97ea write the id in the CR 2008-04-22 22:09:39 +00:00
Enno Rehling 0f06356d70 fixing to remove the platform-specific includes 2008-04-22 21:11:40 +00:00
Enno Rehling d8bcc61a76 problem after last commit 2008-04-22 11:50:06 +00:00
Enno Rehling 5d731316c3 - Changed a couple of compiler-settings 
- Removed a bunch of warnings (shadowing variables)
 2008-04-22 10:40:20 +00:00
Enno Rehling 2557e013fa - regions get a unique id (uid) 
- new data format
- not in the CR yet
- fix for terrain (tutorial crash)
 2008-04-22 10:06:53 +00:00
Enno Rehling 36812c1168 making a warning go away. clarifying the need to remove the _MODULE defines and how to. 2008-04-20 15:18:43 +00:00
Enno Rehling b63200adf9 Eressea can now be compiled and debugged with Eclipse CDT 
Several changes to config.h mean that I probably broke compilation on some platforms. That really needs cleaning up.
 2008-04-20 14:48:15 +00:00
Enno Rehling 485715a5ef corridors get a coast and walls become more wall-ish 2008-04-20 12:26:15 +00:00
Enno Rehling a2ae6a0ea9 Some fixes for Linux and removing some dead code. 2008-04-19 16:56:15 +00:00
Enno Rehling 6739d5ff7e Integrated the editor into the main executable (which means it now requires curses). Should make a #define to disable compilation. 2008-04-19 16:12:13 +00:00
Enno Rehling 6f9f857a83 http://eressea.upb.de/mantis/view.php?id=1201 
- parsing fucked up quotes when finding escaped chars.
- also, removed a warning
 2008-04-18 23:12:23 +00:00
Enno Rehling 1e8af4e0e5 http://eressea.upb.de/mantis/view.php?id=1394 
- fixing toads that lose their changerace attribute
 2008-04-17 15:56:41 +00:00
Enno Rehling 536b177387 http://eressea.upb.de/mantis/view.php?id=1393 
- make mindblast less crazy
 2008-03-29 22:06:20 +00:00
Enno Rehling 3e475d63ad SIMPLE_ESCAPE and SIMPLE_COMBAT no longer needed. 2008-03-29 09:15:14 +00:00
Enno Rehling 3fbf8ffbfc resizing a buffer that was way too small 2008-03-10 12:18:21 +00:00
Enno Rehling c7fe1c21ee http://eressea.upb.de/mantis/view.php?id=1374 
let toads move
 2008-03-05 21:45:12 +00:00
Enno Rehling bb1059eaa1 http://eressea.upb.de/mantis/view.php?id=1364 
"Wechsel von Astralraum in den Realraum möglich, obwohl Der Kontakt zur Realistät verhindert ist."
- was checking the wrong region.
 2008-03-05 21:27:55 +00:00
Enno Rehling 1f69fb7060 http://eressea.upb.de/mantis/view.php?id=1280 
do not count healed people among kills.
 2008-03-05 20:58:44 +00:00
Enno Rehling 91ece491e5 http://eressea.upb.de/mantis/view.php?id=1344 
"Kampfallianzen fehlerhaft"
New units must not be added to a group in another faction, ever.
 2008-03-05 19:30:52 +00:00
Enno Rehling 33da72e28a http://eressea.upb.de/mantis/view.php?id=1308 
"Fehler bei "Schlechte Träume""
- fixed curse_active check.
 2008-03-05 18:39:44 +00:00
Enno Rehling 8bf96a5726 indentation fixes 2008-03-05 18:24:30 +00:00
Enno Rehling bf544ef1be http://eressea.upb.de/mantis/view.php?id=1255 
"keine Meldung ob Zauber erfolgreich oder nicht"
added a missing message
 2008-03-05 16:24:50 +00:00
Enno Rehling a94a80aa8f http://eressea.upb.de/mantis/view.php?id=1254 
"Zauber kostet keine Aura"
 2008-03-05 16:17:51 +00:00
Enno Rehling 280f5a1e97 missing newline in battle-logs 2008-03-05 15:50:59 +00:00
Enno Rehling 50504f0baf eliminating duplicate message-types. 2008-03-05 14:21:58 +00:00
Enno Rehling 68edb409fb - prevent heros from being promoted twice 
- don't initialize order parser twice
- Übergabe von Helden an TEMP-Einheiten erlauben
 2008-03-03 16:43:09 +00:00
Enno Rehling 1fb793509c indentation 2008-02-29 00:26:19 +00:00
Enno Rehling 92b79a1914 http://eressea.upb.de/mantis/view.php?id=1381 
typo
 2008-02-28 22:26:53 +00:00
Enno Rehling aabdbd0325 http://eressea.upb.de/mantis/view.php?id=1378 
- typo
 2008-02-28 19:48:35 +00:00
Enno Rehling fe9bc734da http://eressea.upb.de/mantis/view.php?id=1366 
"Doppelte Fehlermeldung"
- remove error message from inner function.
 2008-02-12 18:51:22 +00:00
Enno Rehling 40898eea55 http://eressea.upb.de/mantis/view.php?id=1365 
"ALLES funktioniert nicht bei GIB"
- disabling OPTION MATERIALPOOL
 2008-02-12 18:26:30 +00:00
Enno Rehling 321723f69f http://eressea.upb.de/mantis/view.php?id=1367 
"Gib Personen an Region ohne Wirkung"
- fixed previous bugfix
 2008-02-12 17:59:41 +00:00
Enno Rehling e37b55699c http://eressea.upb.de/mantis/view.php?id=1250 
- added missing feedback for spell
 2008-02-07 20:56:22 +00:00
Enno Rehling b602fbfab3 http://eressea.upb.de/mantis/view.php?id=1362 
"Beschreibung des Schneemanns unvollständig"
- fixed display of attacks
 2008-02-05 15:36:43 +00:00
Enno Rehling 55fc1ccd47 http://eressea.upb.de/mantis/view.php?id=1351 
"Gegner bewegt sich im Astralraum, obwohl er einen langen Kampf hatte"
- made guarding astral space work.
 2008-02-05 15:23:07 +00:00
Enno Rehling f51e9c9de1 indentation 2008-02-04 23:39:05 +00:00
Enno Rehling b7fdfc5922 http://eressea.upb.de/mantis/view.php?id=1325 
- fixed army_index
 2008-02-04 23:36:22 +00:00
Enno Rehling 3a56a1127c http://eressea.upb.de/mantis/view.php?id=1349 
"Dämonen gehen an die Bauern"
- fixed recruit/release of demons.
 2008-02-04 23:14:50 +00:00
Enno Rehling 7dc301596e http://eressea.upb.de/mantis/view.php?id=1352 
- mo message for failed astral transport
 2008-02-04 21:15:03 +00:00
Enno Rehling 1318b4491d http://eressea.upb.de/mantis/view.php?id=1356 
- fixed monster attacks
 2008-02-04 19:55:11 +00:00
Enno Rehling a2c02ff638 http://eressea.upb.de/mantis/view.php?id=1360 
"Dumpfbackenbrot funktioniert nicht?"
- removed old RTF_SNEAK flag (no longer required)
 2008-02-04 19:22:55 +00:00
Enno Rehling ea71efe3f2 http://eressea.upb.de/mantis/view.php?id=1360 
"Dumpfbackenbrot funktioniert nicht?"
- removed old RTF_SNEAK flag (no longer required)
 2008-02-04 18:48:20 +00:00