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

135 Commits

Author SHA1 Message Date
Enno Rehling abb7c9fb17 Merge branch 'kill-rcspell' into feature/refactor-rcspell 
Conflicts:
	src/kernel/config.h
	src/main.c
	src/report.c
	src/reports.c
	src/reports.test.c
	src/spells.c
 2017-05-21 21:33:29 +02:00
Enno Rehling 7806f4991f store calendar configuration nin JSON, not XML. 2017-05-07 17:46:51 +02:00
Enno Rehling d633c2a9fb BUG 2310: counting units and people. 
reduce number of count_all loops made,
make f->num_units and f->num_people be correct.
 2017-03-11 19:36:26 +01:00
Enno Rehling ba8f51b7d4 Merge pull request #667 from ennorehling/hotfix/config-2301 
fix bugs 2301, 2302, 2303
 2017-03-06 21:57:23 +01:00
Enno Rehling 05bb109a09 BUG 2303: allied units are not traitors. 
had to rewrite the creport code for this, it is probably less efficient now than ever, but at least it works.
 2017-03-06 21:35:48 +01:00
Enno Rehling f699c32f0e BUG 2298: fix NR display. 
always use correct singular or plural form.
 2017-03-05 18:25:15 +01:00
Enno Rehling 0379a17350 make report_resource return an rtype, not a name. 2017-03-05 17:42:57 +01:00
Enno Rehling 45862a06d0 Add a good test for the NR. 
TODO: make it fail.
 2017-03-05 16:55:11 +01:00
Enno Rehling caa8159428 eliminate duplicate string definition 2017-03-05 09:52:17 +01:00
Enno Rehling 4e5f1d05ce Be very strict about C standards. 
Compile with -std=c89 in gcc.
remove all // comments (they are nice, but unnecessary).
variables only declared at start of block.
various pedantery.
backwards compatible va_copy for pre-C99 gcc.
 2017-02-18 21:15:14 +01:00
Enno Rehling 456d1bd196 spellbooks should not use spellref, it's unnecessary. 2017-02-02 20:08:04 +01:00
Enno Rehling 7e69149c40 WIP: spellref everywhere 2017-02-02 16:52:32 +01:00
Enno Rehling ee88c13732 Korrekte Email-Subject und Adresse, auch im NR. 
Eliminate crufty per-game strings.
 2017-01-26 18:06:48 +01:00
Enno Rehling 0496c66028 use FACTION in text template, not ERESSEA 2017-01-26 18:06:15 +01:00
Enno Rehling d94cde67a4 kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
Enno Rehling 9351a1960e gcc warning eliminated 2017-01-26 17:57:21 +01:00
Enno Rehling d71d5e413a eliminate unnecessary strncpy use. 2017-01-26 17:57:21 +01:00
Enno Rehling f297d89958 merge monster.c and monsters.c 
move RCF_DESERT handling to monsters.c
 2017-01-26 17:57:21 +01:00
Enno Rehling a4badc0a75 remove quicklist shim, use selist everywhere 2017-01-26 17:41:21 +01:00
Enno Rehling e52cf75c59 remove autoconf.h from platform.h, fix lots of includes 2016-11-25 20:15:11 +01:00
Enno Rehling 7f9313f1a7 static analysis warnings. 
PVS-Studio warnings reduced or suppressed.
 2016-11-23 18:56:40 +01:00
Enno Rehling ec4060cb9a fix curse-vigour calculation math. 
also fix a ton of small other niggles from pvs-studio.
 2016-11-20 19:08:39 +01:00
Enno Rehling 27605f18ba more boring macros removed. 2016-11-17 21:31:11 +01:00
Enno Rehling 303eb86399 factionid and curseid are also boring. 2016-11-17 21:29:15 +01:00
Enno Rehling 434cf8fce6 the unitid macro is boring. 2016-11-17 21:27:19 +01:00
Enno Rehling 413f70d1a1 move market function out of config.c 2016-11-16 22:30:59 +01:00
Enno Rehling 11b122048b reduce dependency on save.h 
moving a_write* functions to attrib.h, which was most of the reason everyone and their mom include save.h
 2016-11-13 19:40:38 +01:00
Enno Rehling 29d072a186 remove the old ORCIFICATION code. 2016-11-13 17:13:59 +01:00
Enno Rehling 467ffe2db0 include guard.h directly, not through laws.h 2016-11-01 22:11:10 +01:00
Enno Rehling 03d90c5680 remove BOM from UTF-8 files, replace Umlauts 2016-11-01 17:25:52 +01:00
Enno Rehling 754ad78db7 WIP: remove GUARD_* flags. 
TODO: does not compile
TODO: write new guard.test.c tests
 2016-10-31 07:45:06 +01:00
Enno Rehling 15702daf99 Add a new attribute and RF_OBSERVER flag. 2016-09-25 13:01:51 +02:00
Enno Rehling 0753ea0174 fix travelthru reporting (passes unit test) 2016-09-17 08:28:33 +02:00
Enno Rehling 567083c9e8 fix bad translation key 2016-09-16 20:18:53 +02:00
Enno Rehling d449ce4a8c re-enable report writing, fix report.c to work without seen_region 2016-09-16 18:03:28 +02:00
Enno Rehling 4e4b4e482e split off report.test from reports.test 
move some tests around
 2016-09-13 20:13:26 +02:00
Enno Rehling 20578da0e9 delete the old seen.* files 
remove includes for seen.h
remove unused functions
 2016-09-13 16:58:48 +02:00
Enno Rehling 0124bafdc4 delete dead code 2016-09-11 16:44:35 +02:00
Enno Rehling 402c19d8fc dn't warn new player about NMR. 
newbie info text was no longer valid.
 2016-09-11 16:35:55 +02:00
Enno Rehling ef5ce04335 remove unused code 2016-09-07 20:50:52 +02:00
Enno Rehling dda845e2f4 free configuration data (valgrind calls it still-reachable leaks). 2016-09-07 20:46:41 +02:00
Enno Rehling 901cf97cb2 refactoring the "nocostbuilding" curse. 
- remove C_NOCOST constant and other baggage
- refactor maintenance a bit
 2016-08-21 20:02:19 +02:00
Enno Rehling fef2852c5e Reparatur Irrlichter 
https://bugs.eressea.de/view.php?id=2227
 2016-08-06 14:36:54 +02:00
Enno Rehling db5b90e80b clarify building_type.maxsize and add error logging for bug 2221. 
https://bugs.eressea.de/view.php?id=2221
 2016-08-06 13:52:29 +02:00
Enno Rehling 8a3bb35987 eliminate global log_flags, revert the mode arguments for fopen. 
turns out that text is default, and windows hates it if I open a binary file without 'b'
standardize on using join_path to create filenames
(use backslash on windows, even though fopen doesn't seem to care).
 2016-02-05 23:10:05 +01:00
Enno Rehling 91f894b290 teleport.c is the astral space implementation, and it is not one of the core concepts, so move it out of the kernel/ directory 2016-01-28 12:25:16 +01:00
Enno Rehling b6d44410b7 make the password pseudo-private to faction.c 2016-01-12 06:46:51 +01:00
Enno Rehling a02d71bfef https://bugs.eressea.de/view.php?id=2176 
generate the reduced production message before writing reports, so it shows in the CR.
 2015-12-17 12:40:22 +01:00
Steffen Mecke 1f4c521ac8 encapsulate r->land->peasants, money, horses, herbs, morale 2015-12-08 17:57:23 +01:00
Enno Rehling 6a20345b53 issue #428, fix writing spell description for break_curse 2015-12-06 16:45:31 +01:00