Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
3189 commits 10 branches 0 tags 41 MiB
Commit graph

3111 commits

Author SHA1 Message Date
Enno Rehling
18c1971e2e http://bugs.eressea.de/view.php?id=1466 
"Vertrauter wurde zu Magier, kann jetzt nicht mehr zaubern"
necessary fixes for familiars.
 2008-08-28 21:29:05 +00:00
Enno Rehling
17bcb2d7a7 http://bugs.eressea.de/view.php?id=1481 
"Merkwürdiges Supermegamonster frisst Region leer"
fixed error in mistletoe-zombie creation
 2008-08-28 19:01:36 +00:00
Enno Rehling
3c0d17e568 calling remove_unit() instead of set_number() in tidal waves. 2008-08-28 18:03:33 +00:00
Enno Rehling
7114b4f467 http://bugs.eressea.de/view.php?id=1471 
"Vertrauter verschwindet spurlos"
telling players some more about tidal waves
Issue: 1471
 2008-08-28 17:58:54 +00:00
Enno Rehling
802b9332c7 http://bugs.eressea.de/view.php?id=1461 
"Tragekapazität von Monstern zu hoch"
throwing away carts because monsters don't know what to do with them.
 2008-08-28 15:16:13 +00:00
Enno Rehling
38ff80892f locale change 2008-08-28 13:25:33 +00:00
Enno Rehling
79d0f255e2 improve some output, remove some error messages. 2008-08-28 13:23:24 +00:00
Enno Rehling
854135b934 - K_GM can be disabled 
http://bugs.eressea.de/view.php?id=1470
"mit Katapulten kann man nicht bewachen"
fixed siege_weapons parameter
Issue: 1470
 2008-08-28 11:45:49 +00:00
Enno Rehling
bd322436ab check that umlauts are properly recognized (locale supports UTF-8 properly) 2008-08-19 19:53:05 +00:00
Enno Rehling
9a037e2433 less of the "static buffer" warnings in travelthrough-reports 2008-08-18 16:47:05 +00:00
Enno Rehling
1ebe955bbe fix: do not call regionname() twice. 2008-08-18 16:39:08 +00:00
Enno Rehling
9e529a50ae new mail addresses 
gcc-4.2: MAX() and MIN()
 2008-08-18 10:11:51 +00:00
Enno Rehling
8a2fe52291 http://bugs.eressea.de/view.php?id=1465 
"Fliehende Meermenschenkapitäne ertrinken"
 2008-07-24 16:51:11 +00:00
Enno Rehling
a215f35f9f http://bugs.eressea.de/view.php?id=1458 
"Neu entstandene Untote werden nur im CR angezeigt"
- reordering units before writing reports, not earlier
 2008-07-13 09:52:18 +00:00
Enno Rehling
d2c88d6660 http://bugs.eressea.de/view.php?id=1456 
- illusionary buildings not showing up right
Issue: 1456
 2008-07-12 09:45:10 +00:00
Enno Rehling
67c4b861f1 http://bugs.eressea.de/view.php?id=1457 
"ID zu groß"
- fixed parameters for some lua functions (pointers/objects)
Issue: 1457
 2008-07-08 22:28:22 +00:00
Enno Rehling
cf789999cf http://bugs.eressea.de/view.php?id=1457 
"ID zu groß"
- fixed parameters for some lua functions (pointers/objects)
 2008-07-08 21:54:50 +00:00
Enno Rehling
7c65bfc5f7 assertions 2008-07-08 21:45:13 +00:00
Enno Rehling
62f496a4b5 dead units with horses in astral space crash the server 2008-07-06 08:07:22 +00:00
Enno Rehling
9a75def788 http://bugs.eressea.de/view.php?id=1454 
"Kapitan verlässt nach Kampf sein Schiff"
- added a comment for clarity

Issue: 1454
 2008-07-05 14:57:36 +00:00
Enno Rehling
fb8ec1a69f http://bugs.eressea.de/view.php?id=1453 
"Mit Katapulten kann man Steuern eintreiben"
- added a parameter that checks for siege-weapons.
Issue: 1453
 2008-07-04 09:19:12 +00:00
Enno Rehling
f1227d9957 http://bugs.eressea.de/view.php?id=1450 
"Pferde im Nebel"
- reverted removal of ASTRAL_ITEM_RESTRICTIONS
 2008-07-01 20:22:26 +00:00
Enno Rehling
ec5923adc3 http://bugs.eressea.de/view.php?id=1448 
You can teach non-allied units 
- not giving feedback when student does not grant teacher a HELP GUARD
Issue: 1448
 2008-06-21 22:35:39 +00:00
Enno Rehling
bfd52e1b11 fix number of arguments (gcc, we like you) 2008-06-18 09:00:33 +00:00
Enno Rehling
af5477286b fixed an error reading old datafiles (vortex not read properly) 2008-06-18 08:24:11 +00:00
Enno Rehling
d418aca832 http://bugs.eressea.de/view.php?id=1443 
- fixed trails for drifitng ships with no units.
- cleared up some TODOs
Issue: 1443
 2008-06-17 22:35:18 +00:00
Enno Rehling
3b32b490d7 safety net 2008-06-17 08:52:56 +00:00
Enno Rehling
ce6fbde53e http://bugs.eressea.de/view.php?id=1442 
"Unbenannter Effekt (Mahlstrom?)"
- made the quotes around messages in XML optional by parsing as string if there is no leading quote.
 2008-06-17 08:41:17 +00:00
Enno Rehling
13e7e640fb Fixing the tunnels: some target regions were chaotic 2008-06-16 17:44:20 +00:00
Enno Rehling
328bf5a623 Fixing the tunnels and cleaning up a bit. 2008-06-16 17:29:53 +00:00
Enno Rehling
615d948021 - removing unused DELAYED_OFFENSE define 
- fixed duplicate units in CR
- fixed ship/building/unit display in neighbor-regions
 2008-06-16 08:58:56 +00:00
Enno Rehling
e72748a61f http://bugs.eressea.de/view.php?id=1447 
"Im Kampf geflohene Einheit bewacht"

Issue: 1447
 2008-06-15 19:48:21 +00:00
Enno Rehling
c857d632f3 http://bugs.eressea.de/view.php?id=1445 
"Fehler bei Bewegung"
- fixed travel-message using one region less than required.
Issue: 1445
 2008-06-15 19:30:02 +00:00
Enno Rehling
f64271cb9d Fixes based on feedback from darcduck 2008-06-10 20:12:24 +00:00
Enno Rehling
d5ce48bf7f fixes for the prevF speedup 2008-06-09 23:39:15 +00:00
Enno Rehling
b3d22eae63 speeding up u_setfaction 2008-06-09 21:09:18 +00:00
Enno Rehling
22d63cc8cf fixing adamant seeding 2008-06-08 22:13:10 +00:00
Enno Rehling
784a489830 changing region resources 2008-06-08 21:40:12 +00:00
Enno Rehling
cc4d2a1026 compiles with gcc 2008-06-08 20:50:05 +00:00
Enno Rehling
a3b795b2cf seeding adamantium 2008-06-08 20:43:01 +00:00
Enno Rehling
2c41457fd8 BEANSPRUCHE zu RESERVIERE 2008-06-08 10:21:42 +00:00
Enno Rehling
7b71c8f116 pretty name 2008-06-08 10:18:27 +00:00
Enno Rehling
1c139de354 - code to seed adamantium 
- cleaner definition of raw materials
 2008-06-08 10:17:29 +00:00
Enno Rehling
ac595313cf fixes re-run 574 2008-06-08 09:00:35 +00:00
Enno Rehling
04029eef36 compile fixes 2008-06-08 00:10:09 +00:00
Enno Rehling
2e09d16588 more xmlreport features 2008-06-08 00:02:24 +00:00
Enno Rehling
9ffcff7e2a PFL_NOCOORDS is really not needed anywhere. At least I sincerely hope not. 2008-06-07 20:04:45 +00:00
Enno Rehling
c9a2bb4f24 xmlreport (WIP): 
- spells and skills
 2008-06-07 13:17:34 +00:00
Enno Rehling
32aa6a46ce xmlreport: 
- ships are done
- units are getting close
 2008-06-07 12:22:01 +00:00
Enno Rehling
8b242c0b33 xmlreport (WIP): 
- buildings are done
- unit.faction.rel
 2008-06-07 09:55:57 +00:00
Enno Rehling
6e5d930778 xmlreport: 
- coordinates
- terrain names
 2008-06-06 23:35:37 +00:00
Enno Rehling
b5bffaf75e - reorganizing units for faster report-generation 
- more xml functionality
 2008-06-06 21:54:19 +00:00
Enno Rehling
277141c45d 2008-06-06 21:49:29 +00:00
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