From c0c3400f214572cdf29994cc1964fce84ec51046 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 12 Jul 2015 11:01:59 +0200 Subject: [PATCH 1/5] remove junk files, thank you windows --- .gitignore | 1 + .travis.yml.orig | 30 - s/build.orig | 48 -- s/cmake-init.orig | 80 --- s/runtests.orig | 37 - s/travis-build.orig | 83 --- src/kernel/region.c.orig | 1426 -------------------------------------- 7 files changed, 1 insertion(+), 1704 deletions(-) delete mode 100644 .travis.yml.orig delete mode 100644 s/build.orig delete mode 100644 s/cmake-init.orig delete mode 100644 s/runtests.orig delete mode 100644 s/travis-build.orig delete mode 100644 src/kernel/region.c.orig diff --git a/.gitignore b/.gitignore index ddabf2337..fc9945c1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.orig eressea.ini Debug Release diff --git a/.travis.yml.orig b/.travis.yml.orig deleted file mode 100644 index 62592313a..000000000 --- a/.travis.yml.orig +++ /dev/null @@ -1,30 +0,0 @@ -sudo: false -language: c -compiler: -<<<<<<< HEAD -- gcc -- clang -before_install: -- sudo apt-get update -qq -install: -- sudo apt-get install -qq zlib1g-dev libtolua-dev liblua5.1-dev libncurses5-dev libsqlite3-dev libxml2-dev valgrind clang -script: -- s/travis-build -======= - - gcc - - clang -script: s/travis-build -addons: - apt: - packages: - - liblua5.2-dev - - libncurses5-dev - - libsqlite3-dev - - libxml2-dev ->>>>>>> hotfix-3.4.1 -os: -- linux -- osx -notifications: - slack: - secure: F89aXLWaE125PaJIlETv12jT4EfH6wLXJmGCPZzrN3OcLn2ahDWqjwuzR7lOEDf2nAISmeMPyDZMhEHXLNHAE5qP6lg9yliYQw5hzGmDK9m1xUq/pPEne/b2Y7K3my1mkRZ6n3asbHgSmBWAfCIk1JN8R5Rv+rmbLuWLc+zofts= diff --git a/s/build.orig b/s/build.orig deleted file mode 100644 index c1078c99f..000000000 --- a/s/build.orig +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -ROOT=`pwd` -while [ ! -d $ROOT/.git ]; do - ROOT=`dirname $ROOT` -done - -<<<<<<< HEAD -[ -z $BUILD ] && BUILD=Debug -MACHINE=`uname -m` -[ -z "$CC" ] && [ ! -z `which clang` ] && CC="clang" -[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc" -[ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc" -[ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc" -BIN_DIR="build-$MACHINE-$CC-$BUILD" -======= -[ -z "$CC" ] && CC=clang -[ -z "$BUILD" ] && BUILD=Debug ->>>>>>> hotfix-3.4.1 - -[ -z "$JOBS" ] && [ "" != "which nproc" ] && JOBS=`nproc` -DISTCC=`which distcc` -if [ ! -z "$DISTCC" ] ; then -JOBS=`distcc -j` -if [ -z "$JOBS" ] ; then -JOBS=1 -elif [ $JOBS -gt 1 ] ; then -CC="$DISTCC $CC" -MAKEOPTS=-j$JOBS -fi -fi -echo "Building with CC=$CC and $JOBS jobs" - -if [ ! -d $ROOT/$BUILD ]; then - echo "cannot find build directory $BUILD in $ROOT. did you run cmake-init?" - exit -fi - -git submodule update - -if [ -z `which tolua` ]; then -echo "build tolua" -cd $ROOT/tolua ; make -fi - -echo "build eressea" -cd $ROOT/$BUILD -make $MAKEOPTS && make test -cd $OLDPWD diff --git a/s/cmake-init.orig b/s/cmake-init.orig deleted file mode 100644 index 9b74c55db..000000000 --- a/s/cmake-init.orig +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -ROOT=$(pwd) -while [ ! -d $ROOT/.git ]; do - ROOT=$(dirname $ROOT) - if [ "$ROOT" == "/" ; then - echo "could not find root, are you in the git repository?" - exit - fi -done - -[ -z $BUILD ] && BUILD=Debug -MACHINE=`uname -m` -<<<<<<< HEAD -[ -z "$CC" ] && [ ! -z `which clang` ] && CC="clang" -======= -[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="clang" ->>>>>>> hotfix-3.4.1 -[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc" -[ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc" -[ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc" -BIN_DIR="$ROOT/build-$MACHINE-$CC-$BUILD" -mkdir -p $BIN_DIR -ln -sf $BIN_DIR $BUILD - -MACHINE=$(gcc -dumpmachine) -rm -f CMakeCache.txt - -# use anything installed in /opt or /usr -LIBRARY_PATH=/opt/lib:/opt/lib/$MACHINE:/usr/lib/$MACHINE -INCLUDE_PATH=/opt/include:/usr/include -PREFIX_PATH=/opt - -# I like to put stuff in ~/usr if I don't have permission to install packages on the machine: -if [ -d $HOME/usr ]; then - LIBRARY_PATH=$HOME/usr/lib:$HOME/usr/lib/$MACHINE:$LIBRARY_PATH - INCLUDE_PATH=$HOME/usr/include:$HOME/usr/include/$MACHINE:$INCLUDE_PATH - PREFIX_PATH=$HOME/usr:$HOME/usr/local:$PREFIX_PATH -fi - -<<<<<<< HEAD -if [ -z $PC_LUA ] && [ -e /opt/include/lua.h ]; then -PC_LUA=/opt/include -fi -if [ -z $PC_TOLUA ] && [ -e /opt/include/tolua.h ]; then -PC_TOLUA=/opt/include -fi -if [ ! -z $PC_TOLUA ]; then -PC_ARGS="$PC_ARGS -DPC_TOLUA_INCLUDEDIR=$PC_TOLUA/include -DPC_TOLUA_LIBDIR=$PC_TOLUA/lib" -fi -if [ ! -z $PC_LUA ]; then -PC_ARGS="$PC_ARGS -DPC_LUA_INCLUDEDIR=$PC_LUA/include -DPC_LUA_LIBDIR=$PC_LUA/lib" -fi - -cmake .. $PC_ARGS \ - -DCMAKE_MODULE_PATH=$PWD/../cmake/Modules \ -======= -ARGS=" -DCMAKE_MODULE_PATH=$ROOT/cmake/Modules \ ->>>>>>> hotfix-3.4.1 - -DCMAKE_BUILD_TYPE=$BUILD \ - -DCMAKE_LIBRARY_PATH=$LIBRARY_PATH \ - -DCMAKE_INCLUDE_PATH=$INCLUDE_PATH \ - -DCMAKE_PREFIX_PATH=$PREFIX_PATH \ - -DCMAKE_INSTALL_PREFIX=$HOME/eressea/server" - -path="$(which tolua)" -if [ "$HAVE_TOLUA" = "0" ] || [ -z $path ] ; then - echo "tolua is not installed, building from source" - cd $ROOT/tolua ; make - ARGS="$ARGS -DPC_TOLUA_DIR=$ROOT/tolua" -else - echo "tolua is $path" -fi -unset path - -set -e - -cd $BIN_DIR -cmake .. $ARGS $* -cd $OLDPWD - diff --git a/s/runtests.orig b/s/runtests.orig deleted file mode 100644 index a2541d486..000000000 --- a/s/runtests.orig +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -set -e - -ROOT=$(pwd) -while [ ! -d $ROOT/.git ]; do - ROOT=$(dirname $ROOT) -done - -<<<<<<< HEAD -MACHINE=`uname -m` -[ -z "$CC" ] && [ ! -z `which clang` ] && CC="clang" -[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc" -[ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc" -[ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc" -BIN_DIR="build-$MACHINE-$CC-Debug" -======= -[ -z $BUILD ] && BUILD=Debug ; export BUILD ->>>>>>> hotfix-3.4.1 - -if [ ! -e $ROOT/$BUILD ]; then - echo "cannot find build directory $BUILD in $ROOT. did you run cmake-init?" - exit -fi - -$ROOT/$BUILD/eressea/test_eressea -cd $ROOT -[ -e eressea.ini ] || ln -sf conf/eressea.ini -<<<<<<< HEAD -$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests.lua -$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests-e2.lua -$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests-e3.lua - -======= -$ROOT/$BUILD/eressea/eressea -v0 sacripts/run-tests.lua -$ROOT/$BUILD/eressea/eressea -v0 scripts/run-tests-e3.lua ->>>>>>> hotfix-3.4.1 -cd $OLDWPD diff --git a/s/travis-build.orig b/s/travis-build.orig deleted file mode 100644 index d9b1f8da7..000000000 --- a/s/travis-build.orig +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -<<<<<<< HEAD -set -e -ROOT=`pwd` -SUPP=../share/ubuntu-12_04.supp -MACHINE=`uname -m` -[ -z "$CC" ] && [ ! -z `which clang` ] && CC="clang" -[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc" -BUILD="$ROOT/build-$MACHINE-$CC-Debug" -======= -ROOT=`pwd` ->>>>>>> hotfix-3.4.1 - -inifile() { -cd $ROOT -if [ ! -e eressea.ini ]; then -cp conf/eressea.ini . -$BUILD/iniparser/inifile eressea.ini add lua:paths lunit:scripts -fi -} - -<<<<<<< HEAD -build() { -cd $BUILD -cmake -DCMAKE_MODULE_PATH=$ROOT/cmake/Modules -DCMAKE_BUILD_TYPE=Debug .. -scan-build make -} - -test_valgrind_report () { -cd $ROOT/tests -ln -sf ../scripts/config.lua -valgrind --suppressions=$SUPP --error-exitcode=1 $BUILD/eressea/eressea -v0 -t184 ../scripts/reports.lua -} - -test_valgrind_turn () { -cd $ROOT/tests -ln -sf ../scripts/config.lua -valgrind --suppressions=$SUPP --error-exitcode=1 $BUILD/eressea/eressea -v0 -t184 ../scripts/run-turn.lua -} - -test_unittests() { -$BUILD/eressea/test_eressea -} - -cleanup() { -cd $ROOT/tests -rm -rf reports score eressea.log* config.lua data/185.dat datum passwd parteien parteien.full turn -} - -test_server() { -cd $ROOT -inifile -$BUILD/eressea/eressea -v0 scripts/run-tests.lua -$BUILD/eressea/eressea -v0 scripts/run-tests-e2.lua -$BUILD/eressea/eressea -v0 scripts/run-tests-e3.lua -} -# information -echo "* base directory: $ROOT" -echo "* build directory: $BUILD" -echo "* lsb_release:" -lsb_release -a -echo "* zlib1g-dev package:" -dpkg -l zlib1g-dev -echo - -# build the code -[ -d $BUILD ] || mkdir $BUILD -build -test_unittests -test_server -test_valgrind_report -test_valgrind_turn - -cleanup -======= -[ -z $BUILD ] && BUILD=Debug ; export BUILD -s/cmake-init -s/build -cd $ROOT -inifile -s/runtests ->>>>>>> hotfix-3.4.1 diff --git a/src/kernel/region.c.orig b/src/kernel/region.c.orig deleted file mode 100644 index 03fd148cd..000000000 --- a/src/kernel/region.c.orig +++ /dev/null @@ -1,1426 +0,0 @@ -/* -Copyright (c) 1998-2015, Enno Rehling -Katja Zedel - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -**/ - -#include -#include -#include "region.h" - -/* kernel includes */ -#include "alliance.h" -#include "building.h" -#include "connection.h" -#include "curse.h" -#include "equipment.h" -#include "faction.h" -#include "item.h" -#include "messages.h" -#include "plane.h" -#include "region.h" -#include "resources.h" -#include "save.h" -#include "ship.h" -#include "terrain.h" -#include "terrainid.h" -#include "unit.h" -#include "version.h" - -/* util includes */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include - -/* libc includes */ -#include -#include -#include -#include -#include -#include - -extern int dice_rand(const char *s); - -region *regions; - -int get_maxluxuries(void) -{ - const luxury_type *ltype; - int maxluxuries = 0; - for (ltype = luxurytypes; ltype; ltype = ltype->next) { - ++maxluxuries; - } - return maxluxuries; -} - -const int delta_x[MAXDIRECTIONS] = { - -1, 0, 1, 1, 0, -1 -}; - -const int delta_y[MAXDIRECTIONS] = { - 1, 1, 0, -1, -1, 0 -}; - -static const direction_t back[MAXDIRECTIONS] = { - D_SOUTHEAST, - D_SOUTHWEST, - D_WEST, - D_NORTHWEST, - D_NORTHEAST, - D_EAST, -}; - -direction_t dir_invert(direction_t dir) -{ - switch (dir) { - case D_PAUSE: - case D_SPECIAL: - return dir; - break; - default: - if (dir >= 0 && dir < MAXDIRECTIONS) - return back[dir]; - } - assert(!"illegal direction"); - return NODIRECTION; -} - -const char *write_regionname(const region * r, const faction * f, char *buffer, - size_t size) -{ - char *buf = (char *)buffer; - const struct locale *lang = f ? f->locale : 0; - if (r == NULL) { - strlcpy(buf, "(null)", size); - } - else { - plane *pl = rplane(r); - int nx = r->x, ny = r->y; - pnormalize(&nx, &ny, pl); - adjust_coordinates(f, &nx, &ny, pl); - slprintf(buf, size, "%s (%d,%d)", rname(r, lang), nx, ny); - } - return buffer; -} - -const char *regionname(const region * r, const faction * f) -{ - static int index = 0; - static char buf[2][NAMESIZE]; - index = 1 - index; - return write_regionname(r, f, buf[index], sizeof(buf[index])); -} - -int deathcount(const region * r) -{ - attrib *a = a_find(r->attribs, &at_deathcount); - if (!a) - return 0; - return a->data.i; -} - -void deathcounts(region * r, int fallen) -{ - attrib *a; - static const curse_type *ctype = NULL; - - if (fallen == 0) - return; - if (!ctype) - ctype = ct_find("holyground"); - if (ctype && curse_active(get_curse(r->attribs, ctype))) - return; - - a = a_find(r->attribs, &at_deathcount); - if (!a) - a = a_add(&r->attribs, a_new(&at_deathcount)); - a->data.i += fallen; - - if (a->data.i <= 0) - a_remove(&r->attribs, a); -} - -/* Moveblock wird zur Zeit nicht über Attribute, sondern ein Bitfeld - r->moveblock gemacht. Sollte umgestellt werden, wenn kompliziertere - Dinge gefragt werden. */ - -/********************/ -/* at_moveblock */ -/********************/ -void a_initmoveblock(attrib * a) -{ - a->data.v = calloc(1, sizeof(moveblock)); -} - -int a_readmoveblock(attrib * a, void *owner, struct storage *store) -{ - moveblock *m = (moveblock *)(a->data.v); - int i; - - READ_INT(store, &i); - m->dir = (direction_t)i; - return AT_READ_OK; -} - -void -a_writemoveblock(const attrib * a, const void *owner, struct storage *store) -{ - moveblock *m = (moveblock *)(a->data.v); - WRITE_INT(store, (int)m->dir); -} - -attrib_type at_moveblock = { - "moveblock", a_initmoveblock, NULL, NULL, a_writemoveblock, a_readmoveblock -}; - -#define coor_hashkey(x, y) (unsigned int)((x<<16) + y) -#define RMAXHASH MAXREGIONS -static region *regionhash[RMAXHASH]; -static int dummy_data; -static region *dummy_ptr = (region *)& dummy_data; /* a funny hack */ - -typedef struct uidhashentry { - int uid; - region *r; -} uidhashentry; -static uidhashentry uidhash[MAXREGIONS]; - -struct region *findregionbyid(int uid) -{ - int key = uid % MAXREGIONS; - while (uidhash[key].uid != 0 && uidhash[key].uid != uid) { - if (++key == MAXREGIONS) key = 0; - } - return uidhash[key].r; -} - -#define DELMARKER dummy_ptr - -static void unhash_uid(region * r) -{ - int key = r->uid % MAXREGIONS; - assert(r->uid); - while (uidhash[key].uid != 0 && uidhash[key].uid != r->uid) { - if (++key == MAXREGIONS) key = 0; - } - assert(uidhash[key].r == r); - uidhash[key].r = NULL; -} - -static void hash_uid(region * r) -{ - int uid = r->uid; - for (;;) { - if (uid != 0) { - int key = uid % MAXREGIONS; - while (uidhash[key].uid != 0 && uidhash[key].uid != uid) { - if (++key == MAXREGIONS) key = 0; - } - if (uidhash[key].uid == 0) { - uidhash[key].uid = uid; - uidhash[key].r = r; - break; - } - assert(uidhash[key].r != r || !"duplicate registration"); - } - r->uid = uid = rng_int(); - } -} - -#define HASH_STATISTICS 1 -#if HASH_STATISTICS -static int hash_requests; -static int hash_misses; -#endif - -bool pnormalize(int *x, int *y, const plane * pl) -{ - if (pl) { - if (x) { - int width = pl->maxx - pl->minx + 1; - int nx = *x - pl->minx; - nx = (nx > 0) ? nx : (width - (-nx) % width); - *x = nx % width + pl->minx; - } - if (y) { - int height = pl->maxy - pl->miny + 1; - int ny = *y - pl->miny; - ny = (ny > 0) ? ny : (height - (-ny) % height); - *y = ny % height + pl->miny; - } - } - return false; /* TBD */ -} - -static region *rfindhash(int x, int y) -{ - unsigned int rid = coor_hashkey(x, y); - int key = HASH1(rid, RMAXHASH), gk = HASH2(rid, RMAXHASH); -#if HASH_STATISTICS - ++hash_requests; -#endif - while (regionhash[key] != NULL && (regionhash[key] == DELMARKER - || regionhash[key]->x != x || regionhash[key]->y != y)) { - key = (key + gk) % RMAXHASH; -#if HASH_STATISTICS - ++hash_misses; -#endif - } - return regionhash[key]; -} - -void rhash(region * r) -{ - unsigned int rid = coor_hashkey(r->x, r->y); - int key = HASH1(rid, RMAXHASH), gk = HASH2(rid, RMAXHASH); - while (regionhash[key] != NULL && regionhash[key] != DELMARKER - && regionhash[key] != r) { - key = (key + gk) % RMAXHASH; - } - assert(regionhash[key] != r || !"trying to add the same region twice"); - regionhash[key] = r; -} - -void runhash(region * r) -{ - unsigned int rid = coor_hashkey(r->x, r->y); - int key = HASH1(rid, RMAXHASH), gk = HASH2(rid, RMAXHASH); - -#ifdef FAST_CONNECT - int d, di; - for (d = 0, di = MAXDIRECTIONS / 2; d != MAXDIRECTIONS; ++d, ++di) { - region *rc = r->connect[d]; - if (rc != NULL) { - if (di >= MAXDIRECTIONS) - di -= MAXDIRECTIONS; - rc->connect[di] = NULL; - r->connect[d] = NULL; - } - } -#endif - while (regionhash[key] != NULL && regionhash[key] != r) { - key = (key + gk) % RMAXHASH; - } - assert(regionhash[key] == r || !"trying to remove a unit that is not hashed"); - regionhash[key] = DELMARKER; -} - -region *r_connect(const region * r, direction_t dir) -{ - region *result; - int x, y; -#ifdef FAST_CONNECT - region *rmodify = (region *)r; - assert(dir >= 0 && dir < MAXDIRECTIONS); - if (r->connect[dir]) - return r->connect[dir]; -#endif - assert(dir < MAXDIRECTIONS); - x = r->x + delta_x[dir]; - y = r->y + delta_y[dir]; - pnormalize(&x, &y, rplane(r)); - result = rfindhash(x, y); -#ifdef FAST_CONNECT - if (result) { - rmodify->connect[dir] = result; - result->connect[back[dir]] = rmodify; - } -#endif - return result; -} - -region *findregion(int x, int y) -{ - return rfindhash(x, y); -} - -/* Contributed by Hubert Mackenberg. Thanks. - * x und y Abstand zwischen x1 und x2 berechnen - */ -static int koor_distance_orig(int x1, int y1, int x2, int y2) -{ - int dx = x1 - x2; - int dy = y1 - y2; - - /* Bei negativem dy am Ursprung spiegeln, das veraendert - * den Abstand nicht - */ - if (dy < 0) { - dy = -dy; - dx = -dx; - } - - /* - * dy ist jetzt >=0, fuer dx sind 3 Faelle zu untescheiden - */ - if (dx >= 0) { - int result = dx + dy; - return result; - } - else if (-dx >= dy) { - int result = -dx; - return result; - } - else { - return dy; - } -} - -static int -koor_distance_wrap_xy(int x1, int y1, int x2, int y2, int width, int height) -{ - int dx = x1 - x2; - int dy = y1 - y2; - int result, dist; - int mindist = _min(width, height) >> 1; - - /* Bei negativem dy am Ursprung spiegeln, das veraendert - * den Abstand nicht - */ - if (dy < 0) { - dy = -dy; - dx = -dx; - } - if (dx < 0) { - dx = width + dx; - } - /* dx,dy is now pointing northeast */ - result = dx + dy; - if (result <= mindist) - return result; - - dist = (width - dx) + (height - dy); /* southwest */ - if (dist >= 0 && dist < result) { - result = dist; - if (result <= mindist) - return result; - } - dist = _max(dx, height - dy); - if (dist >= 0 && dist < result) { - result = dist; - if (result <= mindist) - return result; - } - dist = _max(width - dx, dy); - if (dist >= 0 && dist < result) - result = dist; - return result; -} - -int koor_distance(int x1, int y1, int x2, int y2) -{ - const plane *p1 = findplane(x1, y1); - const plane *p2 = findplane(x2, y2); - if (p1 != p2) - return INT_MAX; - else { - int width = plane_width(p1); - int height = plane_height(p1); - if (width && height) { - return koor_distance_wrap_xy(x1, y1, x2, y2, width, height); - } - else { - return koor_distance_orig(x1, y1, x2, y2); - } - } -} - -int distance(const region * r1, const region * r2) -{ - return koor_distance(r1->x, r1->y, r2->x, r2->y); -} - -void free_regionlist(region_list * rl) -{ - while (rl) { - region_list *rl2 = rl->next; - free(rl); - rl = rl2; - } -} - -void add_regionlist(region_list ** rl, region * r) -{ - region_list *rl2 = (region_list *)malloc(sizeof(region_list)); - - rl2->data = r; - rl2->next = *rl; - - *rl = rl2; -} - -/********************/ -/* at_horseluck */ -/********************/ -attrib_type at_horseluck = { - "horseluck", - DEFAULT_INIT, - DEFAULT_FINALIZE, - DEFAULT_AGE, - NO_WRITE, - NO_READ, - ATF_UNIQUE -}; - -/**********************/ -/* at_peasantluck */ -/**********************/ -attrib_type at_peasantluck = { - "peasantluck", - DEFAULT_INIT, - DEFAULT_FINALIZE, - DEFAULT_AGE, - NO_WRITE, - NO_READ, - ATF_UNIQUE -}; - -/*********************/ -/* at_deathcount */ -/*********************/ -attrib_type at_deathcount = { - "deathcount", - DEFAULT_INIT, - DEFAULT_FINALIZE, - DEFAULT_AGE, - a_writeint, - a_readint, - ATF_UNIQUE -}; - -/*********************/ -/* at_woodcount */ -/*********************/ -attrib_type at_woodcount = { - "woodcount", - DEFAULT_INIT, - DEFAULT_FINALIZE, - DEFAULT_AGE, - NO_WRITE, - a_readint, - ATF_UNIQUE -}; - -/*********************/ -/* at_travelunit */ -/*********************/ -attrib_type at_travelunit = { - "travelunit", - DEFAULT_INIT, - DEFAULT_FINALIZE, - DEFAULT_AGE, - NO_WRITE, - NO_READ -}; - -void rsetroad(region * r, direction_t d, int val) -{ - connection *b; - region *r2 = rconnect(r, d); - - assert(val>=SHRT_MIN && val<=SHRT_MAX); - if (!r2) { - return; - } - b = get_borders(r, r2); - while (b && b->type != &bt_road) { - b = b->next; - } - if (!b) { - if (!val) return; - b = new_border(&bt_road, r, r2); - } - if (r == b->from) { - b->data.sa[0] = (short)val; - } - else { - b->data.sa[1] = (short)val; - } -} - -int rroad(const region * r, direction_t d) -{ - connection *b; - region *r2 = rconnect(r, d); - - if (!r2) { - return 0; - } - b = get_borders(r, r2); - while (b && b->type != &bt_road) { - b = b->next; - } - if (!b) { - return 0; - } - - return (r == b->from) ? b->data.sa[0] : b->data.sa[1]; -} - -bool r_isforest(const region * r) -{ - if (fval(r->terrain, FOREST_REGION)) { - /* needs to be covered with at leas 48% trees */ - int mincover = (int)(r->terrain->size * 0.48); - int trees = rtrees(r, 2) + rtrees(r, 1); - return (trees * TREESIZE >= mincover); - } - return false; -} - -bool is_coastregion(region * r) -{ - direction_t i; - int res = 0; - - for (i = 0; !res && i < MAXDIRECTIONS; i++) { - region *rn = rconnect(r, i); - if (rn && fval(rn->terrain, SEA_REGION)) - res++; - } - return res != 0; -} - -int rpeasants(const region * r) -{ - return ((r)->land ? (r)->land->peasants : 0); -} - -void rsetpeasants(region * r, int value) -{ - if (r->land) r->land->peasants = value; - else assert(value>=0); -<<<<<<< HEAD -======= - ->>>>>>> hotfix-3.4.1 -} - -int rmoney(const region * r) -{ - return ((r)->land ? (r)->land->money : 0); -} - -void rsethorses(const region * r, int value) -{ - assert(value >= 0); - if (r->land) - r->land->horses = value; -} - -int rhorses(const region * r) -{ - return r->land ? r->land->horses : 0; -} - -void rsetmoney(region * r, int value) -{ - if (r->land) r->land->money = value; - else assert(value >= 0); -} - -void r_setdemand(region * r, const luxury_type * ltype, int value) -{ - struct demand *d, **dp = &r->land->demands; - - if (ltype == NULL) - return; - - while (*dp && (*dp)->type != ltype) - dp = &(*dp)->next; - d = *dp; - if (!d) { - d = *dp = malloc(sizeof(struct demand)); - d->next = NULL; - d->type = ltype; - } - d->value = value; -} - -const item_type *r_luxury(region * r) -{ - struct demand *dmd; - if (r->land) { - if (!r->land->demands) { - fix_demand(r); - } - for (dmd = r->land->demands; dmd; dmd = dmd->next) { - if (dmd->value == 0) - return dmd->type->itype; - } - } - return NULL; -} - -int r_demand(const region * r, const luxury_type * ltype) -{ - struct demand *d = r->land->demands; - while (d && d->type != ltype) - d = d->next; - if (!d) - return -1; - return d->value; -} - -const char *rname(const region * r, const struct locale *lang) -{ - if (r->land && r->land->name) { - return r->land->name; - } - return LOC(lang, terrain_name(r)); -} - -int rtrees(const region * r, int ageclass) -{ - return ((r)->land ? (r)->land->trees[ageclass] : 0); -} - -int rsettrees(const region * r, int ageclass, int value) -{ - if (!r->land) - assert(value == 0); - else { - assert(value >= 0); - return r->land->trees[ageclass] = value; - } - return 0; -} - -static region *last; - -static unsigned int max_index = 0; - -region *new_region(int x, int y, struct plane *pl, int uid) -{ - region *r; - - pnormalize(&x, &y, pl); - r = rfindhash(x, y); - - if (r) { - log_error("duplicate region discovered: %s(%d,%d)\n", regionname(r, NULL), x, y); - if (r->units) - log_error("duplicate region contains units\n"); - return r; - } - r = calloc(1, sizeof(region)); - r->x = x; - r->y = y; - r->uid = uid; - r->age = 1; - r->_plane = pl; - rhash(r); - hash_uid(r); - if (last) - addlist(&last, r); - else - addlist(®ions, r); - last = r; - assert(r->next == NULL); - r->index = ++max_index; - return r; -} - -static region *deleted_regions; - -void remove_region(region ** rlist, region * r) -{ - - while (r->units) { - unit *u = r->units; - i_freeall(&u->items); - remove_unit(&r->units, u); - } - - runhash(r); - unhash_uid(r); - while (*rlist && *rlist != r) - rlist = &(*rlist)->next; - assert(*rlist == r); - *rlist = r->next; - r->next = deleted_regions; - deleted_regions = r; -} - -static void freeland(land_region * lr) -{ - while (lr->demands) { - struct demand *d = lr->demands; - lr->demands = d->next; - free(d); - } - if (lr->name) - free(lr->name); - free(lr); -} - -void region_setresource(region * r, const resource_type * rtype, int value) -{ - rawmaterial *rm = r->resources; - while (rm) { - if (rm->type->rtype == rtype) { - rm->amount = value; - break; - } - rm = rm->next; - } - if (!rm) { - if (rtype == get_resourcetype(R_SILVER)) - rsetmoney(r, value); - else if (rtype == get_resourcetype(R_PEASANT)) - rsetpeasants(r, value); - else if (rtype == get_resourcetype(R_HORSE)) - rsethorses(r, value); - else { - int i; - for (i = 0; r->terrain->production[i].type; ++i) { - const terrain_production *production = r->terrain->production + i; - if (production->type == rtype) { - add_resource(r, 1, value, dice_rand(production->divisor), rtype); - break; - } - } - } - } -} - -int region_getresource(const region * r, const resource_type * rtype) -{ - const rawmaterial *rm; - for (rm = r->resources; rm; rm = rm->next) { - if (rm->type->rtype == rtype) { - return rm->amount; - } - } - if (rtype == get_resourcetype(R_SILVER)) - return rmoney(r); - if (rtype == get_resourcetype(R_HORSE)) - return rhorses(r); - if (rtype == get_resourcetype(R_PEASANT)) - return rpeasants(r); - return 0; -} - -void free_region(region * r) -{ - if (last == r) - last = NULL; - free(r->display); - if (r->land) - freeland(r->land); - - if (r->msgs) { - free_messagelist(r->msgs); - r->msgs = 0; - } - - while (r->individual_messages) { - struct individual_message *msg = r->individual_messages; - r->individual_messages = msg->next; - if (msg->msgs) - free_messagelist(msg->msgs); - free(msg); - } - - while (r->attribs) - a_remove(&r->attribs, r->attribs); - while (r->resources) { - rawmaterial *res = r->resources; - r->resources = res->next; - free(res); - } - - while (r->donations) { - donation *don = r->donations; - r->donations = don->next; - free(don); - } - - while (r->units) { - unit *u = r->units; - r->units = u->next; - uunhash(u); - free_unit(u); - free(u); - } - - while (r->buildings) { - building *b = r->buildings; - assert(b->region == r); - r->buildings = b->next; - bunhash(b); /* must be done here, because remove_building does it, and wasn't called */ - free_building(b); - } - - while (r->ships) { - ship *s = r->ships; - assert(s->region == r); - r->ships = s->next; - sunhash(s); - free_ship(s); - } - - free(r); -} - -void free_regions(void) -{ - memset(uidhash, 0, sizeof(uidhash)); - while (deleted_regions) { - region *r = deleted_regions; - deleted_regions = r->next; - free_region(r); - } - while (regions) { - region *r = regions; - regions = r->next; - runhash(r); - free_region(r); - } - max_index = 0; - last = NULL; -} - -/** creates a name for a region - * TODO: Make vowels XML-configurable and allow non-ascii characters again. - * - that will probably require a wchar_t * string to pick from. - */ -static char *makename(void) -{ - int s, v, k, e, p = 0, x = 0; - size_t nk, ne, nv, ns; - static char name[16]; - const char *kons = "bcdfghklmnprstvwz", - *start = "bcdgtskpvfr", - *end = "nlrdst", - *vowels = "aaaaaaaaaaaeeeeeeeeeeeeiiiiiiiiiiioooooooooooouuuuuuuuuuyy"; - - /* const char * vowels_latin1 = "aaaaaaaaaàâeeeeeeeeeéèêiiiiiiiiiíîoooooooooóòôuuuuuuuuuúyy"; */ - - nk = strlen(kons); - ne = strlen(end); - nv = strlen(vowels); - ns = strlen(start); - - for (s = rng_int() % 3 + 2; s > 0; s--) { - if (x > 0) { - k = rng_int() % (int)nk; - name[p] = kons[k]; - p++; - } - else { - k = rng_int() % (int)ns; - name[p] = start[k]; - p++; - } - v = rng_int() % (int)nv; - name[p] = vowels[v]; - p++; - if (rng_int() % 3 == 2 || s == 1) { - e = rng_int() % (int)ne; - name[p] = end[e]; - p++; - x = 1; - } - else - x = 0; - } - name[p] = '\0'; - name[0] = (char)toupper(name[0]); - return name; -} - -void setluxuries(region * r, const luxury_type * sale) -{ - const luxury_type *ltype; - - assert(r->land); - - if (r->land->demands) { - freelist(r->land->demands); - r->land->demands = 0; - } - - for (ltype = luxurytypes; ltype; ltype = ltype->next) { - struct demand *dmd = malloc(sizeof(struct demand)); - dmd->type = ltype; - if (ltype != sale) - dmd->value = 1 + rng_int() % 5; - else - dmd->value = 0; - dmd->next = r->land->demands; - r->land->demands = dmd; - } -} - -void terraform_region(region * r, const terrain_type * terrain) -{ - /* Resourcen, die nicht mehr vorkommen können, löschen */ - const terrain_type *oldterrain = r->terrain; - rawmaterial **lrm = &r->resources; - - assert(terrain); - - while (*lrm) { - rawmaterial *rm = *lrm; - const resource_type *rtype = NULL; - - if (terrain->production != NULL) { - int i; - for (i = 0; terrain->production[i].type; ++i) { - if (rm->type->rtype == terrain->production[i].type) { - rtype = rm->type->rtype; - break; - } - } - } - if (rtype == NULL) { - *lrm = rm->next; - free(rm); - } - else { - lrm = &rm->next; - } - } - - r->terrain = terrain; - terraform_resources(r); - - if (!fval(terrain, LAND_REGION)) { - region_setinfo(r, NULL); - if (r->land != NULL) { - i_freeall(&r->land->items); - freeland(r->land); - r->land = NULL; - } - rsettrees(r, 0, 0); - rsettrees(r, 1, 0); - rsettrees(r, 2, 0); - rsethorses(r, 0); - rsetpeasants(r, 0); - rsetmoney(r, 0); - freset(r, RF_ENCOUNTER); - freset(r, RF_MALLORN); - /* Beschreibung und Namen löschen */ - return; - } - - if (r->land) { - int d; - for (d = 0; d != MAXDIRECTIONS; ++d) { - rsetroad(r, d, 0); - } - i_freeall(&r->land->items); - } - else { - static struct surround { - struct surround *next; - const luxury_type *type; - int value; - } *trash = NULL, *nb = NULL; - const luxury_type *ltype = NULL; - direction_t d; - int mnr = 0; - - r->land = calloc(1, sizeof(land_region)); - r->land->ownership = NULL; - region_set_morale(r, MORALE_DEFAULT, -1); - region_setname(r, makename()); - for (d = 0; d != MAXDIRECTIONS; ++d) { - region *nr = rconnect(r, d); - if (nr && nr->land) { - struct demand *sale = r->land->demands; - while (sale && sale->value != 0) - sale = sale->next; - if (sale) { - struct surround *sr = nb; - while (sr && sr->type != sale->type) - sr = sr->next; - if (!sr) { - if (trash) { - sr = trash; - trash = trash->next; - } - else { - sr = calloc(1, sizeof(struct surround)); - } - sr->next = nb; - sr->type = sale->type; - sr->value = 1; - nb = sr; - } - else - sr->value++; - ++mnr; - } - } - } - if (!nb) { - // TODO: this is really lame - int i = get_maxluxuries(); - if (i > 0) { - i = rng_int() % i; - ltype = luxurytypes; - while (i--) - ltype = ltype->next; - } - } - else { - int i = rng_int() % mnr; - struct surround *srd = nb; - while (i > srd->value) { - i -= srd->value; - srd = srd->next; - } - if (srd->type) - setluxuries(r, srd->type); - while (srd->next != NULL) - srd = srd->next; - srd->next = trash; - trash = nb; - nb = NULL; - } - } - - if (fval(terrain, LAND_REGION)) { - const item_type *itype = NULL; - char equip_hash[64]; - - /* TODO: put the equipment in struct terrain, faster */ - sprintf(equip_hash, "terrain_%s", terrain->_name); - equip_items(&r->land->items, get_equipment(equip_hash)); - - if (r->terrain->herbs) { - int len = 0; - while (r->terrain->herbs[len]) - ++len; - if (len) - itype = r->terrain->herbs[rng_int() % len]; - } - if (itype != NULL) { - rsetherbtype(r, itype); - rsetherbs(r, (short)(50 + rng_int() % 31)); - } - else { - rsetherbtype(r, NULL); - } - if (oldterrain == NULL || !fval(oldterrain, LAND_REGION)) { - if (rng_int() % 100 < 3) - fset(r, RF_MALLORN); - else - freset(r, RF_MALLORN); - if (rng_int() % 100 < ENCCHANCE) { - fset(r, RF_ENCOUNTER); - } - } - } - - if (oldterrain == NULL || terrain->size != oldterrain->size) { - if (terrain == newterrain(T_PLAIN)) { - rsethorses(r, rng_int() % (terrain->size / 50)); - if (rng_int() % 100 < 40) { - rsettrees(r, 2, terrain->size * (30 + rng_int() % 40) / 1000); - } - } - else if (chance(0.2)) { - rsettrees(r, 2, terrain->size * (30 + rng_int() % 40) / 1000); - } - else { - rsettrees(r, 2, 0); - } - rsettrees(r, 1, rtrees(r, 2) / 4); - rsettrees(r, 0, rtrees(r, 2) / 8); - - if (!fval(r, RF_CHAOTIC)) { - int peasants; - peasants = (maxworkingpeasants(r) * (20 + dice_rand("6d10"))) / 100; - rsetpeasants(r, _max(100, peasants)); - rsetmoney(r, rpeasants(r) * ((wage(r, NULL, NULL, - INT_MAX) + 1) + rng_int() % 5)); - } - } -} - -/** ENNO: - * ich denke, das das hier nicht sein sollte. - * statt dessen sollte ein attribut an der region sein, das das erledigt, - * egal ob durch den spell oder anderes angelegt. - **/ -#include "curse.h" -int production(const region * r) -{ - /* muß rterrain(r) sein, nicht rterrain() wegen rekursion */ - int p = r->terrain->size; - if (curse_active(get_curse(r->attribs, ct_find("drought")))) - p /= 2; - - return p; -} - -int resolve_region_coor(variant id, void *address) -{ - region *r = findregion(id.sa[0], id.sa[1]); - if (r) { - *(region **)address = r; - return 0; - } - *(region **)address = NULL; - return -1; -} - -int resolve_region_id(variant id, void *address) -{ - region *r = NULL; - if (id.i != 0) { - r = findregionbyid(id.i); - if (r == NULL) { - *(region **)address = NULL; - return -1; - } - } - *(region **)address = r; - return 0; -} - -variant read_region_reference(struct storage * store) -{ - variant result; - if (global.data_version < UIDHASH_VERSION) { - int n; - READ_INT(store, &n); - result.sa[0] = (short)n; - READ_INT(store, &n); - result.sa[1] = (short)n; - } - else { - READ_INT(store, &result.i); - } - return result; -} - -void write_region_reference(const region * r, struct storage *store) -{ - if (r) { - WRITE_INT(store, r->uid); - } - else { - WRITE_INT(store, 0); - } -} - -struct message_list *r_getmessages(const struct region *r, - const struct faction *viewer) -{ - struct individual_message *imsg = r->individual_messages; - while (imsg && (imsg)->viewer != viewer) - imsg = imsg->next; - if (imsg) - return imsg->msgs; - return NULL; -} - -struct message *r_addmessage(struct region *r, const struct faction *viewer, -struct message *msg) -{ - assert(r); - if (viewer) { - struct individual_message *imsg; - imsg = r->individual_messages; - while (imsg && imsg->viewer != viewer) - imsg = imsg->next; - if (imsg == NULL) { - imsg = malloc(sizeof(struct individual_message)); - imsg->next = r->individual_messages; - imsg->msgs = NULL; - r->individual_messages = imsg; - imsg->viewer = viewer; - } - return add_message(&imsg->msgs, msg); - } - return add_message(&r->msgs, msg); -} - -struct faction *region_get_owner(const struct region *r) -{ - assert(rule_region_owners()); - if (r->land && r->land->ownership) { - return r->land->ownership->owner; - } - return NULL; -} - -struct alliance *region_get_alliance(const struct region *r) -{ - assert(rule_region_owners()); - if (r->land && r->land->ownership) { - region_owner *own = r->land->ownership; - return own->owner ? own->owner->alliance : own->alliance; - } - return NULL; -} - -void region_set_owner(struct region *r, struct faction *owner, int turn) -{ - assert(rule_region_owners()); - if (r->land) { - if (!r->land->ownership) { - r->land->ownership = malloc(sizeof(region_owner)); - assert(region_get_morale(r) == MORALE_DEFAULT); - r->land->ownership->owner = NULL; - r->land->ownership->alliance = NULL; - r->land->ownership->flags = 0; - } - r->land->ownership->since_turn = turn; - r->land->ownership->morale_turn = turn; - assert(r->land->ownership->owner != owner); - r->land->ownership->owner = owner; - if (owner) { - r->land->ownership->alliance = owner->alliance; - } - } -} - -faction *update_owners(region * r) -{ - faction *f = NULL; - assert(rule_region_owners()); - if (r->land) { - building *bowner = largestbuilding(r, &cmp_current_owner, false); - building *blargest = largestbuilding(r, &cmp_taxes, false); - if (blargest) { - if (!bowner || bowner->size < blargest->size) { - /* region owners update? */ - unit *u = building_owner(blargest); - f = region_get_owner(r); - if (u == NULL) { - if (f) { - region_set_owner(r, NULL, turn); - r->land->ownership->flags |= OWNER_MOURNING; - f = NULL; - } - } - else if (u->faction != f) { - if (!r->land->ownership) { - /* there has never been a prior owner */ - region_set_morale(r, MORALE_DEFAULT, turn); - } - else { - alliance *al = region_get_alliance(r); - if (al && u->faction->alliance == al) { - int morale = _max(0, r->land->morale - MORALE_TRANSFER); - region_set_morale(r, morale, turn); - } - else { - region_set_morale(r, MORALE_TAKEOVER, turn); - if (f) { - r->land->ownership->flags |= OWNER_MOURNING; - } - } - } - region_set_owner(r, u->faction, turn); - f = u->faction; - } - } - } - else if (r->land->ownership && r->land->ownership->owner) { - r->land->ownership->flags |= OWNER_MOURNING; - region_set_owner(r, NULL, turn); - f = NULL; - } - } - return f; -} - -void region_setinfo(struct region *r, const char *info) -{ - free(r->display); - r->display = info ? _strdup(info) : 0; -} - -const char *region_getinfo(const region * r) -{ - return r->display ? r->display : ""; -} - -void region_setname(struct region *r, const char *name) -{ - if (r->land) { - free(r->land->name); - r->land->name = name ? _strdup(name) : 0; - } -} - -const char *region_getname(const region * r) -{ - if (r->land && r->land->name) { - return r->land->name; - } - return ""; -} - -int region_get_morale(const region * r) -{ - if (r->land) { - assert(r->land->morale >= 0 && r->land->morale <= MORALE_MAX); - return r->land->morale; - } - return -1; -} - -void region_set_morale(region * r, int morale, int turn) -{ - if (r->land) { - r->land->morale = (short)morale; - if (turn >= 0 && r->land->ownership) { - r->land->ownership->morale_turn = turn; - } - assert(r->land->morale >= 0 && r->land->morale <= MORALE_MAX); - } -} - -void get_neighbours(const region * r, region ** list) -{ - int dir; - for (dir = 0; dir != MAXDIRECTIONS; ++dir) { - list[dir] = rconnect(r, (direction_t)dir); - } -} - -int owner_change(const region * r) -{ - if (r->land && r->land->ownership) { - return r->land->ownership->since_turn; - } - return INT_MIN; -} - -bool is_mourning(const region * r, int in_turn) -{ - int change = owner_change(r); - return (change == in_turn - 1 - && (r->land->ownership->flags & OWNER_MOURNING)); -} From 3fc3660152daef145ca83cdc4381c49c1d9653db Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 12 Jul 2015 13:15:10 +0200 Subject: [PATCH 2/5] ignore PVS=-Studio files --- .gitignore | 2 ++ src/magic.h | 2 +- src/util/variant.h | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fc9945c1f..66d38f2a9 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ game-e3/reports/ tags Thumbs.db .gdb_history +*.cfg +*.cmd diff --git a/src/magic.h b/src/magic.h index 13ca5d517..39d5877e0 100644 --- a/src/magic.h +++ b/src/magic.h @@ -58,7 +58,7 @@ extern "C" { sppobj_t typ; int flag; union { - struct region *r; + struct region *r; //TODO: V117 http://www.viva64.com/en/V117 Memsize type is used in the union. struct unit *u; struct building *b; struct ship *sh; diff --git a/src/util/variant.h b/src/util/variant.h index b65ee0868..4559264ed 100644 --- a/src/util/variant.h +++ b/src/util/variant.h @@ -5,12 +5,12 @@ extern "C" { #endif typedef union variant { - void *v; + void *v; //TODO: V117 http://www.viva64.com/en/V117 Memsize type is used in the union. int i; char c; short s; short sa[2]; - char ca[4]; + char ca[4]; //TODO: V112 http://www.viva64.com/en/V112 Dangerous magic number 4 used: char ca[4];. float f; } variant; From 0a57933e30949aa86acdb8e9261cda38a81656f7 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 12 Jul 2015 14:10:12 +0200 Subject: [PATCH 3/5] minor optimizations, error checking (static analysis) --- src/battle.c | 5 +++-- src/kernel/curse.h | 36 ++++++++++++++++++------------------ src/magic.c | 16 ++++++++++++---- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/battle.c b/src/battle.c index f97c39a2a..4719da5b7 100644 --- a/src/battle.c +++ b/src/battle.c @@ -2339,8 +2339,9 @@ void do_regenerate(fighter * af) ta.index = af->fighting; while (ta.index--) { - af->person[ta.index].hp += effskill(au, SK_STAMINA); - af->person[ta.index].hp = _min(unit_max_hp(au), af->person[ta.index].hp); + struct person *p = af->person + ta.index; + p->hp += effskill(au, SK_STAMINA); + p->hp = _min(unit_max_hp(au), p->hp); } } diff --git a/src/kernel/curse.h b/src/kernel/curse.h index 86d94c935..45665f5cb 100644 --- a/src/kernel/curse.h +++ b/src/kernel/curse.h @@ -179,18 +179,6 @@ extern "C" { /* ------------------------------------------------------------- */ /* Allgemeine Zauberwirkungen */ - typedef struct curse { - struct curse *nexthash; - int no; /* 'Einheitennummer' dieses Curse */ - const struct curse_type *type; /* Zeiger auf ein curse_type-struct */ - int flags; /* WARNING: these are XORed with type->flags! */ - int duration; /* Dauer der Verzauberung. Wird jede Runde vermindert */ - double vigour; /* Stärke der Verzauberung, Widerstand gegen Antimagie */ - struct unit *magician; /* Pointer auf den Magier, der den Spruch gewirkt hat */ - double effect; - variant data; /* pointer auf spezielle curse-unterstructs */ - } curse; - #define c_flags(c) ((c)->type->flags ^ (c)->flags) /* ------------------------------------------------------------- */ @@ -200,17 +188,29 @@ extern "C" { int typ; int flags; int mergeflags; - struct message *(*curseinfo) (const void *, objtype_t, const struct curse *, - int); - void(*change_vigour) (curse *, double); - int(*read) (struct storage * store, curse * c, void *target); - int(*write) (struct storage * store, const struct curse * c, + struct message *(*curseinfo) (const void *, objtype_t, + const struct curse *, int); + void(*change_vigour) (struct curse *, double); + int(*read) (struct storage * store, struct curse *, void *target); + int(*write) (struct storage * store, const struct curse *, const void *target); int(*cansee) (const struct faction *, const void *, objtype_t, const struct curse *, int); - int(*age) (curse *); + int(*age) (struct curse *); } curse_type; + typedef struct curse { + variant data; /* pointer auf spezielle curse-unterstructs */ + struct curse *nexthash; + const curse_type *type; /* Zeiger auf ein curse_type-struct */ + struct unit *magician; /* Pointer auf den Magier, der den Spruch gewirkt hat */ + double vigour; /* Stärke der Verzauberung, Widerstand gegen Antimagie */ + double effect; + int no; /* 'Einheitennummer' dieses Curse */ + int flags; /* WARNING: these are XORed with type->flags! */ + int duration; /* Dauer der Verzauberung. Wird jede Runde vermindert */ + } curse; + extern struct attrib_type at_curse; void curse_write(const struct attrib *a, const void *owner, struct storage *store); diff --git a/src/magic.c b/src/magic.c index f610f1d77..6d713ba63 100644 --- a/src/magic.c +++ b/src/magic.c @@ -2560,7 +2560,7 @@ static castorder *cast_cmd(unit * u, order * ord) } s = gettoken(token, sizeof(token)); } - if (!s || !s[0] || strlen(s) == 0) { + if (!s || !s[0]) { /* Fehler "Es wurde kein Zauber angegeben" */ cmistake(u, ord, 172, MSG_MAGIC); return 0; @@ -2571,7 +2571,7 @@ static castorder *cast_cmd(unit * u, order * ord) /* Vertraute können auch Zauber sprechen, die sie selbst nicht * können. unit_getspell findet aber nur jene Sprüche, die * die Einheit beherrscht. */ - if (!sp && is_familiar(u)) { + if (!sp && is_familiar(u)) { caster = get_familiar_mage(u); if (caster) { familiar = u; @@ -2695,8 +2695,16 @@ static castorder *cast_cmd(unit * u, order * ord) if (!s || *s == 0) break; if (p + 1 >= size) { - size *= 2; - params = (char**)realloc(params, sizeof(char *) * size); + char ** tmp; + tmp = (char**)realloc(params, sizeof(char *) * size * 2); + if (tmp) { + size *= 2; + params = tmp; + } + else { + log_error("error allocationg %d bytes: %s", size * 2, strerror(errno)); + break; + } } params[p++] = _strdup(s); } From f1b0488a7880dfecfcd15f105bd28c295aefc81b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 12 Jul 2015 14:15:20 +0200 Subject: [PATCH 4/5] missing include --- src/magic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/magic.c b/src/magic.c index 6d713ba63..943c59db2 100644 --- a/src/magic.c +++ b/src/magic.c @@ -76,6 +76,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include +#include #include const char *magic_school[MAXMAGIETYP] = { From 21a81bd3077244ba2a1f5a09af75f00de5daf7c7 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 12 Jul 2015 14:24:46 +0200 Subject: [PATCH 5/5] cleanup: struct declaration, more static. --- src/kernel/curse.h | 3 +++ src/spells/borders.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/kernel/curse.h b/src/kernel/curse.h index 45665f5cb..cd745bfdb 100644 --- a/src/kernel/curse.h +++ b/src/kernel/curse.h @@ -26,6 +26,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. extern "C" { #endif + struct curse; + struct curse_type; + /* Sprueche in der struct region und auf Einheiten, Schiffen oder Burgen * (struct attribute) */ diff --git a/src/spells/borders.c b/src/spells/borders.c index e3d29c152..d1b5625cc 100644 --- a/src/spells/borders.c +++ b/src/spells/borders.c @@ -29,7 +29,7 @@ typedef struct wallcurse { connection *wall; } wallcurse; -void cw_init(attrib * a) +static void cw_init(attrib * a) { curse *c; curse_init(a); @@ -37,7 +37,7 @@ void cw_init(attrib * a) c->data.v = calloc(sizeof(wallcurse), 1); } -void cw_write(const attrib * a, const void *target, storage * store) +static void cw_write(const attrib * a, const void *target, storage * store) { connection *b = ((wallcurse *)((curse *)a->data.v)->data.v)->wall; curse_write(a, target, store); @@ -86,7 +86,7 @@ static int cw_read(attrib * a, void *target, storage * store) * Was fuer eine Wirkung hat die? */ -void wall_vigour(curse * c, double delta) +static void wall_vigour(curse * c, double delta) { wallcurse *wc = (wallcurse *)c->data.v; assert(wc->buddy->vigour == c->vigour); @@ -105,7 +105,7 @@ const curse_type ct_firewall = { wall_vigour /* change_vigour */ }; -attrib_type at_cursewall = { +static attrib_type at_cursewall = { "cursewall", cw_init, curse_done,