Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #70 from badgerman/master 

fix broken chaoscount attributes loading
This commit is contained in:
Enno Rehling 2014-12-13 18:23:45 +01:00
parent a2c98778fd f8136530ef
commit a12958dac0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/chaos.c
View File

@ -44,7 +44,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/* at_chaoscount */ /* at_chaoscount */
/*********************/ /*********************/
attrib_type at_chaoscount = { attrib_type at_chaoscount = {
"get_chaoscount", "chaoscount",
DEFAULT_INIT, DEFAULT_INIT,
DEFAULT_FINALIZE, DEFAULT_FINALIZE,
DEFAULT_AGE, DEFAULT_AGE,
@ -251,6 +251,6 @@ void chaos_update(void) {
} }
} }
void chaos_init(void) { void chaos_register(void) {
at_register(&at_chaoscount); at_register(&at_chaoscount);
} }

2
src/chaos.h
View File

@ -26,7 +26,7 @@ extern "C" {
extern struct attrib_type at_chaoscount; extern struct attrib_type at_chaoscount;
void chaos_init(void); void chaos_register(void);
void chaos_update(void); void chaos_update(void);
int get_chaoscount(const struct region * r); int get_chaoscount(const struct region * r);

2
src/eressea.c
View File

@ -20,6 +20,7 @@
#include <modules/xmas.h> #include <modules/xmas.h>
#include <items/itemtypes.h> #include <items/itemtypes.h>
#include <attributes/attributes.h> #include <attributes/attributes.h>
#include "chaos.h"
#include "report.h" #include "report.h"
#include "items.h" #include "items.h"
#include "creport.h" #include "creport.h"
@ -73,4 +74,5 @@ void game_init(void)
register_attributes(); register_attributes();
register_gmcmd(); register_gmcmd();
chaos_register();
} }