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

5456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
077a0aeeef plug some new memory leaks 2014-12-30 00:00:57 +01:00
Enno Rehling
95ab2826ec avoid running over the array of locales in order.c when re-creating locales for tests. 2014-12-29 23:53:00 +01:00
Enno Rehling
43351e03cd parsing needs to return a static buffer if it has no argument 2014-12-29 07:44:00 +01:00
Enno Rehling
6ffec7017c Merge branch 'master' of github.com:eressea/server 2014-12-29 07:33:49 +01:00
Enno Rehling
f8fd0bed39 Merge pull request #92 from badgerman/master 
miscellaneous refactoring
 2014-12-29 07:33:16 +01:00
Enno Rehling
335f37a9ec clarify some parsing code that valgrind complains about. 2014-12-28 22:07:53 +01:00
Enno Rehling
880b965c54 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2014-12-28 17:29:34 +01:00
Enno Rehling
50aa3cc444 backup with orders after the turn is done 2014-12-28 17:27:49 +01:00
Enno Rehling
975b930f44 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2014-12-27 23:57:16 +01:00
Enno Rehling
df3ce116a7 limit eternath gates to 1-person units, avoid crash 2014-12-27 23:51:48 +01:00
Enno Rehling
f1008fa231 fix floating point exception. 2014-12-26 01:41:19 +01:00
Enno Rehling
108a909131 kill gc_add and gc_done, they were terrible ideas. 2014-12-25 22:38:01 +01:00
Enno Rehling
4e94a95835 remove dead code, move weight(unit) to unit.c 2014-12-25 19:40:40 +01:00
Enno Rehling
901c70efd9 config cleanup contd. 
createunit => create_unit, everywhere.
make_undead_unit in zombies.c
 2014-12-25 18:40:46 +01:00
Enno Rehling
4bb65873da shipspeed should be in ship.c, not in config.c 2014-12-25 18:16:24 +01:00
Enno Rehling
14bb27d89c Merge pull request #91 from badgerman/master 
kill EnhancedQuit and other dead code
 2014-12-25 12:35:09 +01:00
Enno Rehling
4f962ae999 remove dead code 2014-12-25 00:45:52 +01:00
Enno Rehling
000bdebc82 Merge remote-tracking branch 'eressea/master' 2014-12-24 23:50:55 +01:00
Enno Rehling
45cb6f07c2 Merge pull request #90 from CTD1/Destroy 
Zerstöre als langer Befehl
 2014-12-24 23:00:49 +01:00
Enno Rehling
3e4973db25 kill the unused EnhancedQuit feature, reducing the potential use of at_object by one more situation. 2014-12-24 16:33:21 +01:00
Enno Rehling
ea035ac154 convert float values in at_object to integer where it makes sense. 
this feature is only used for the embassy_muschel turn, and I am tempted to kill it entirely.
 2014-12-24 16:21:01 +01:00
Enno Rehling
67881dfff4 parsing tokens when buffer is too small - skip the entire token. now with tests. 2014-12-24 15:55:55 +01:00
CTD
78c03f831b Zerstöre als langer Befehl 
Zerstöre ist damit ein ganz normaler langer Befehl wie Mache oder Lerne.
 2014-12-23 15:53:28 +01:00
Enno Rehling
1ba7248e48 Merge pull request #88 from badgerman/parser-static-removal 
parser refactoring, tests and cleanup.
 2014-12-23 13:27:35 +01:00
Enno Rehling
b27491eccd move atoip out of config (small helper) and test it. 
remove some unnecessary variables from laws.c
 2014-12-23 09:23:37 +01:00
Enno Rehling
5ebf05f625 additional tests for the parser. 
move more parsing code out of config.c
 2014-12-22 16:45:56 +01:00
Enno Rehling
c8b9044f78 rename to gettoken, use more widely, add a basic test. 2014-12-22 16:28:17 +01:00
Enno Rehling
870d8001ef more getstrtoken() removal. 
remove obsolete argument to checkpasswd().
 2014-12-22 14:34:14 +01:00
Enno Rehling
5cdc85f6bf start to get rid of getstrtoken(), which uses an internal static buffer and causes horrible bugs when called multiple times. 2014-12-22 14:21:24 +01:00
Enno Rehling
0b58ca9176 try to handle more potential errors 2014-12-21 13:41:21 +01:00
Enno Rehling
c70676ca2e Merge branch 'version-3-3' 2014-12-21 13:19:29 +01:00
Enno Rehling
786f5e8302 backup the correct turn 2014-12-21 13:19:12 +01:00
Enno Rehling
e04d002420 Merge pull request #87 from badgerman/master 
DESCRIBE would crash if not given a description (crash).
 2014-12-20 22:43:58 +01:00
Enno Rehling
4097e43ce6 DESCRIBE would crash if not given a description. 
Added a test for DESCRIBE UNIT.
 2014-12-20 22:18:38 +01:00
Enno Rehling
921e570102 Merge pull request #86 from badgerman/master 
Monsters should LOOT, not TAX in E3 and E4
 2014-12-20 21:53:08 +01:00
Enno Rehling
4018aa2dfe Merge remote-tracking branch 'eressea/master' 2014-12-20 21:37:14 +01:00
Enno Rehling
f6f193ab76 Monsters should LOOT if the rules don't allow TAX. 2014-12-20 21:37:06 +01:00
Enno Rehling
d67ecdb8cf Merge pull request #64 from CTD1/Bauern 
Bauern in leeren Regionen
 2014-12-19 20:08:42 +01:00
Enno Rehling
e9dda0d702 Merge pull request #85 from badgerman/master 
remove some more code.feature: show unit limit in NR & CR
 2014-12-19 20:07:26 +01:00
Enno Rehling
b3bec13051 report the unit limit in NR and CR. 
this implements https://bugs.eressea.de/view.php?id=2055
 2014-12-19 19:57:24 +01:00
Enno Rehling
2966e1ea3d remove igetstrtoken, a confusing helper function that was hardly used at all. 2014-12-18 17:47:49 +01:00
CTD
c914c83947 Grenze für E2 
auf 500 Bauern erhöht.
 2014-12-18 11:57:30 +01:00
Enno Rehling
da1d3c49c3 ongoing config.c cleanup: getid() 2014-12-18 07:09:22 +01:00
Enno Rehling
e51811df3b Merge pull request #84 from badgerman/master 
added tests: region owners can set PAY NOT <id> for empty buildings if ...
 2014-12-17 21:37:56 +01:00
Enno Rehling
484e52d491 added a test: region owners can set PAY NOT <id> for empty buildings if they are in region_owner_pay_building. 2014-12-17 21:31:02 +01:00
Enno Rehling
d7899a392a Merge pull request #81 from CTD1/BEZAHLE_NICHT_ID 
BEZAHLE NICHT ID
 2014-12-17 20:18:08 +01:00
Enno Rehling
83f014047b Merge pull request #83 from badgerman/master 
cleaning up in config.c and adding tests for pay_cmd
 2014-12-17 20:17:20 +01:00
Enno Rehling
bd6b9761b0 add simple tests for pay_cmd. 2014-12-17 20:00:55 +01:00
Enno Rehling
077af5c52c Merge pull request #82 from badgerman/remove-at-gm 
remove old at_gm feature (player-operated quests)
 2014-12-17 19:35:58 +01:00
Enno Rehling
916271ef3a gcc/clang want structs to be defined before used in an argument list 2014-12-17 18:47:01 +01:00