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

Merge branch 'master' of github.com:badgerman/eressea

This commit is contained in:
Enno Rehling 2014-10-14 22:57:16 +02:00
parent 403c1ad6a9 cf71d667c2
commit 9ce996051d
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml Normal file
View File

@ -0,0 +1,8 @@
language: c
compiler:
- gcc
- clang
script: s/travis-build
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq libtolua-dev liblua5.1-dev libncurses5-dev libsqlite3-dev libxml2-dev

10
s/travis-build Executable file
View File

@ -0,0 +1,10 @@
#!/bin/sh
ln -sf conf/eressea.ini
[ -d build ] || mkdir build
cd build && cmake .. \
-DCMAKE_MODULE_PATH=$PWD/../cmake/Modules \
-DCMAKE_BUILD_TYPE=Debug .. && \
make && cd .. &&
build/eressea/test_eressea &&
build/eressea/eressea -v0 scripts/run-tests.lua

3
src/laws.test.c
View File

@ -287,9 +287,8 @@ void setup_guard(guard_fixture *fix, bool armed) {
if (armed) { if (armed) {
item_type *itype; item_type *itype;
weapon_type *wtype;
itype = it_get_or_create(rt_get_or_create("sword")); itype = it_get_or_create(rt_get_or_create("sword"));
wtype = new_weapontype(itype, 0, 0.0, NULL, 0, 0, 0, SK_MELEE, 2); new_weapontype(itype, 0, 0.0, NULL, 0, 0, 0, SK_MELEE, 2);
i_change(&u->items, itype, 1); i_change(&u->items, itype, 1);
set_level(u, SK_MELEE, 2); set_level(u, SK_MELEE, 2);
} }