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

unlimited teachers. 

quicklist replaces fixed array.
This commit is contained in:
Enno Rehling 2016-12-11 21:29:07 +01:00 committed by Enno Rehling
parent d42f1767ff
commit 61f3585ad7
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/study.c
View File

@ -53,6 +53,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <util/rng.h>
#include <util/umlaut.h>
#include <quicklist.h>
/* libc includes */
#include <assert.h>
#include <limits.h>
@ -216,24 +218,11 @@ teach_unit(unit * teacher, unit * student, int nteaching, skill_t sk,
n = _min(n, nteaching);
if (n != 0) {
int index = 0;
if (teach == NULL) {
a = a_add(&student->attribs, a_new(&at_learning));
teach = (teaching_info *)a->data.v;
}
else {
while (teach->teachers[index] && index != MAXTEACHERS)
++index;
}
if (index < MAXTEACHERS)
teach->teachers[index++] = teacher;
if (index < MAXTEACHERS) {
teach->teachers[index] = NULL;
}
else {
log_error("MAXTEACHERS=%d is too low for student %s, teacher %s", MAXTEACHERS, unitname(student), unitname(teacher));
}
ql_push(&teach->teachers, teacher);
teach->value += n;
if (student->building && teacher->building == student->building) {
@ -717,7 +706,7 @@ int study_cmd(unit * u, order * ord)
a = a_add(&u->attribs, a_new(&at_learning));
teach = (teaching_info *)a->data.v;
assert(teach);
teach->teachers[0] = 0;
teach->teachers = NULL;
}
if (money > 0) {
use_pooled(u, get_resourcetype(R_SILVER), GET_DEFAULT, money);
@ -766,9 +755,9 @@ int study_cmd(unit * u, order * ord)
learn_skill(u, sk, days);
if (a != NULL) {
int index = 0;
while (teach->teachers[index] && index != MAXTEACHERS) {
unit *teacher = teach->teachers[index++];
ql_iter qli = qli_init(&teach->teachers);
while (qli_more(qli)) {
unit *teacher = (unit *)qli_next(&qli);
if (teacher->faction != u->faction) {
bool feedback = alliedunit(u, teacher->faction, HELP_GUARD);
if (feedback) {

4
src/study.h
View File

@ -27,6 +27,7 @@ extern "C" {
#endif
struct unit;
struct quicklist;
int teach_cmd(struct unit *u, struct order *ord);
int study_cmd(struct unit *u, struct order *ord);
@ -45,10 +46,9 @@ extern "C" {
void demon_skillchange(struct unit *u);
#define MAXTEACHERS 32
#define TEACHNUMBER 10
typedef struct teaching_info {
struct unit *teachers[MAXTEACHERS];
struct quicklist *teachers;
int value;
} teaching_info;

10
src/study.test.c
View File

@ -18,9 +18,11 @@
#include <util/base36.h>
#include <tests.h>
#include <CuTest.h>
#include <quicklist.h>
#include <assert.h>
#include <CuTest.h>
#define MAXLOG 4
typedef struct log_entry {
@ -537,9 +539,9 @@ static void test_teach_message(CuTest *tc) {
teach = (teaching_info *)a->data.v;
CuAssertPtrNotNull(tc, teach->teachers);
CuAssertIntEquals(tc, 600, teach->value);
CuAssertPtrEquals(tc, u1, teach->teachers[0]);
CuAssertPtrEquals(tc, u2, teach->teachers[1]);
CuAssertPtrEquals(tc, NULL, teach->teachers[2]);
CuAssertIntEquals(tc, 2, ql_length(teach->teachers));
CuAssertPtrEquals(tc, u1, ql_get(teach->teachers, 0));
CuAssertPtrEquals(tc, u2, ql_get(teach->teachers, 1));
study_cmd(u, u->thisorder);
CuAssertPtrEquals(tc, NULL, test_find_messagetype(u1->faction->msgs, "teach_teacher"));
CuAssertPtrNotNull(tc, test_find_messagetype(u2->faction->msgs, "teach_teacher"));