From e11a6f556112d6cda4d76ef98a5bcf07e377c33b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 17 Feb 2001 15:02:50 +0000 Subject: [PATCH] bugfix FOLGE, bugfix Parser --- src/common/gamecode/gamecode-6.dsp | 4 +- src/common/kernel/kernel-6.dsp | 2 +- src/common/kernel/magic.c | 4 +- src/common/kernel/movement.c | 74 +++++++++++++++-------------- src/common/kernel/save.c | 23 +++++---- src/common/util/umlaut.c | 10 ++-- src/eressea-6.opt | Bin 146432 -> 0 bytes src/eressea/eressea-6.dsp | 16 ++++++- 8 files changed, 76 insertions(+), 57 deletions(-) delete mode 100644 src/eressea-6.opt diff --git a/src/common/gamecode/gamecode-6.dsp b/src/common/gamecode/gamecode-6.dsp index 0980aa6fb..e8970cd34 100644 --- a/src/common/gamecode/gamecode-6.dsp +++ b/src/common/gamecode/gamecode-6.dsp @@ -66,7 +66,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "BETA_CODE" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I ".." /I "../.." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "BETA_CODE" /FR /YX"stdafx.h" /FD /c # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe @@ -114,7 +114,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Profile" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /GX- /Z7 /O2 /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /Za /W4 /Z7 /O2 /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe diff --git a/src/common/kernel/kernel-6.dsp b/src/common/kernel/kernel-6.dsp index 435a49cab..4f1ea9c72 100644 --- a/src/common/kernel/kernel-6.dsp +++ b/src/common/kernel/kernel-6.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "NDEBUG" /D "CONVERT_TRIGGER" /YX /FD /c +# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "NDEBUG" /YX /FD /c # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe diff --git a/src/common/kernel/magic.c b/src/common/kernel/magic.c index 105a61695..d540d9b0c 100644 --- a/src/common/kernel/magic.c +++ b/src/common/kernel/magic.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: magic.c,v 1.8 2001/02/15 02:41:46 enno Exp $ + * $Id: magic.c,v 1.9 2001/02/17 15:02:49 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -579,7 +579,7 @@ find_spellbyname(unit *u, char *s) } } - if (findtoken(&spellnames, s, (void**)&i) && getspell(u, spelldaten[i].id)) return &spelldaten[i]; + if (findtoken(&spellnames, s, (void**)&i)==0 && getspell(u, spelldaten[i].id)) return &spelldaten[i]; return (spell *) NULL; } diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c index 0dda8f7fb..f8fa9eb9c 100644 --- a/src/common/kernel/movement.c +++ b/src/common/kernel/movement.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: movement.c,v 1.9 2001/02/14 07:44:57 enno Exp $ + * $Id: movement.c,v 1.10 2001/02/17 15:02:49 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -1136,44 +1136,48 @@ travel(region * first, unit * u, region * next, int flucht) ut = getunit(first, u); if (ut) { - if (igetkeyword(ut->thisorder) == K_DRIVE) { - u2 = getunit(first, ut); - if (!u2) { - cmistake(ut, ut->thisorder, 64, MSG_MOVE); - continue; - } else { -#ifndef NEW_DRIVE - restkapazitaet -= weight(ut); - if (restkapazitaet >= 0) { -#endif - add_message(&u->faction->msgs, new_message( - u->faction, "transport%u:unit%u:target%r:start%r:end", - u, ut, first, current)); - - if(!(terrain[current->terrain].flags & WALK_INTO) - && get_item(ut, I_HORSE)) { - cmistake(ut, ut->thisorder, 67, MSG_MOVE); - continue; - } - if(can_survive(ut, current)) { - for (i = 0; i != m; i++) - travelthru(ut, rv[i]); - move_unit(ut, current, NULL); - } else { - cmistake(ut, ut->thisorder, 230, MSG_MOVE); - continue; - } -#ifndef NEW_DRIVE + boolean found = false; + strlist * ot; + for(ot=ut->orders;ot && !found;ot = ot->next) { + if (igetkeyword(ot->s) == K_DRIVE) { + u2 = getunit(first, ut); + if (!u2) { + cmistake(ut, ut->thisorder, 64, MSG_MOVE); + continue; } else { - sprintf(buf, "Keine Transportkapazitäten" - " frei für %s und deren Gepäck.", unitname(ut)); - mistake(u, u->thisorder, buf, MSG_MOVE); - } +#ifndef NEW_DRIVE + restkapazitaet -= weight(ut); + if (restkapazitaet >= 0) { #endif + add_message(&u->faction->msgs, new_message( + u->faction, "transport%u:unit%u:target%r:start%r:end", + u, ut, first, current)); + + if(!(terrain[current->terrain].flags & WALK_INTO) + && get_item(ut, I_HORSE)) { + cmistake(ut, ut->thisorder, 67, MSG_MOVE); + continue; + } + if(can_survive(ut, current)) { + for (i = 0; i != m; i++) + travelthru(ut, rv[i]); + move_unit(ut, current, NULL); + } else { + cmistake(ut, ut->thisorder, 230, MSG_MOVE); + continue; + } +#ifndef NEW_DRIVE + } else { + sprintf(buf, "Keine Transportkapazitäten" + " frei für %s und deren Gepäck.", unitname(ut)); + mistake(u, u->thisorder, buf, MSG_MOVE); + } +#endif + } + found = true; } - } else { - cmistake(u, u->thisorder, 90, MSG_MOVE); } + if (!found) cmistake(u, u->thisorder, 90, MSG_MOVE); } else { if (ut) { sprintf(buf, diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c index cd66510b9..da464ff32 100644 --- a/src/common/kernel/save.c +++ b/src/common/kernel/save.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: save.c,v 1.18 2001/02/14 22:34:49 enno Exp $ + * $Id: save.c,v 1.19 2001/02/17 15:02:49 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -455,7 +455,10 @@ readfaction(void) * muß in "Gänsefüßchen" stehen!! */ /* War vorher in main.c:getgarbage() */ - if (!quiet) { printf(" %4s;", factionid(f)); fflush(stdout); } + if (1 || !quiet) { + printf(" %4s;", factionid(f)); + fflush(stdout); + } freestrlist(f->mistakes); f->mistakes = 0; @@ -488,26 +491,27 @@ int readorders(const char *filename) { FILE * F; - faction *f; char *b; - int p; + int nfactions=0; + struct faction *f = NULL; - F = cfopen(filename, "r"); + F = cfopen(filename, "rt"); if (F==NULL) return 0; - printf(" - lese Befehlsdatei...\n"); + puts(" - lese Befehlsdatei...\n"); b = getbuf(F); /* Auffinden der ersten Partei, und danach abarbeiten bis zur letzten * Partei */ - f = 0; - while (b) { + int p; + switch (igetparam(b)) { case P_FACTION: f = readfaction(); + if (f) ++nfactions; b = getbuf(F); @@ -541,7 +545,8 @@ readorders(const char *filename) } fclose(F); - printf("\n"); + puts("\n"); + printf(" %d Befehlsdateien gelesen\n", nfactions); return 0; } /* ------------------------------------------------------------- */ diff --git a/src/common/util/umlaut.c b/src/common/util/umlaut.c index b7725b376..de954efd4 100644 --- a/src/common/util/umlaut.c +++ b/src/common/util/umlaut.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: umlaut.c,v 1.5 2001/02/15 02:41:47 enno Exp $ + * $Id: umlaut.c,v 1.6 2001/02/17 15:02:50 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -119,14 +119,12 @@ findtoken(tnode * tk, const char * str, void **result) ++str; if (!ref) return E_TOK_NOMATCH; tk = ref->node; - if (tk && !(tk->flags & SHARED)) { + } + if (tk) { + if (tk->flags & LEAF || !(tk->flags & SHARED)) { *result = tk->id; return E_TOK_SUCCESS; } } - if (tk && (tk->flags & LEAF)) { - *result = tk->id; - return E_TOK_SUCCESS; - } return E_TOK_NOMATCH; } diff --git a/src/eressea-6.opt b/src/eressea-6.opt deleted file mode 100644 index 50127f75708174e6eae6573969937f1164ccfa6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146432 zcmeHw3xFKwUEiMNd#xUprPE249ed*>b{y+Yr;{vO#!)QYo#Hdr1D#`~VFR9<{cdl3 zvop)gtR8U#N=YA32nmEVbqWM%LR;DrN`cabRzRSEwmceI(vm{bmbOmQ2lNGmIQ{)+ z=G%Gf>^F0(u~x?ak^cAX&U~-=?Kj`d{Qi&c*MIHy&;Q_$@Bcz2wH>c)sl4>n$;w!4 z{}y~6k>7V#aQv%ZrLQuj&+mr(ZwLmaX( zya93_Dq|ZPu zK;91dGmv*cz8+GCyc6;bkZ*)M3(+8}5FJA01=2N06S595AkRTIASR>*u^=|24f!Sr zm2;7LkPhS`?h z7WzYj728R)ZUZeBtvSK2P5s@8_P3zKG^A+z+o*-G{iR9+zp>||K)W})?Lhlf6}3%U zk@D16+5QNAKf0F3T3Wj;oHs2zT5qq4R$Vy4b%j=U?T(|1dT=yMW{%D_-1Z1cO*FNZ z(CvnJs82cFZnbQyF0*w%L{*Gy?uKUC)`31Xgoo>48Y>ufv0p)X24Na2*s>cPQ@Drw zv>5g|%vBH5sQj%R&oF1yg(*wj&)3CjOT*Uh?NbVe>JSO*n9$dSzVX_0?qGL4NMz=! z=6Q~>+VO;YEL|Y{^};iXGS;Jy(Rq!zZDE@3A$27|rh1S>g-0Dt7w$oISwBzR{~If5 zc%qe8($7=(|3)RpHiTmdGpEBrrh1S>g{z*US+1#hw)0@0UVFA}y7efZM0^5xH=Dw7 zb4I<)hAM*mQR{R~g};hCSl8Dzt0~qr-7{=!R$hdH7rd zU~SvcoGZ08!xS|dRTq}eES|lvQh$2s^tt-^m2-#Y=MT+3efr$JwM&M#Uej&M6PD*z zzrK3VvQ4{b*ACkEF4)#ZoCcaZ7+oc+u6}Q=I$Mtp*4ws$;*O^^-C1|lNgi|rK%^e` z90||NKae@Aga`z~BGz8R(VDguw6&>%hG}-_bT;4QyX@AgA@Z9H24cLg0u!7ou87<= zdy1MZ*AbUAr?L5>mxR_Xf{>iVVjb2TVQIN7W)y6;^j3aXGYYmkuIRJ|Y0}n(W?8t$ zCLWzQ{gr8*`vzG=yVojr?(zU56tY9bL2? zJXr+OH%*3{?~126P2oABS!53D-Z)|xck&*R*NOf$(3G6}i)0q3dz8>Sj(a`jJC@-M z)O_KqC#&xpbo&^zWe4|xi`Q}D?z*jS40O(((GqrNFudq=F}u22Gx)g@xBY0S`~6BB z^KWLoyEkmd5gT5|={?lajErZ5;5o84xBPwR$UCDaA9`ZYtVYc=EIjw%QKhAAh*@!2 z)E-wo1Vt6BI`$=3)C_CQ_8*?;x$3d?!^h8dymrT{T`;VMed)1-*i*$uN6rhkV|s3| zFMLe$Tb!xQ)i86|&Kuna4&XEHnAV{4rtIptQbMV^aC@iaYQGM6jv*5}qt6#FV>+My1 zz9_42$vO-5kf;FO7y(A$)rr6sXmlR#a}$ybTI~5UK@*Jm+JXjvBY8V$)%SxGByE7) z4iHI*jWh}}-*1Ka`~%@1nU7dpnNQXi&-ZD3`4EH{*CP3-`Mi9{;xocU@=;!@lled9 z|Cs;tnZr8sf6V{I=>U;8GBAX=|_1AM=0m#~|KOZp{C|NRaLS*#0lD9Ay5F?f-le@$dnc z`M)~b|E1jrl>8gp|4A$CI@|y0zWw09R(OTkbIC8oDLl6SOIr3v8iro`JhuOl=)CP- z_#czcf8c#w%>VecRB7n{ybLe;Wq8AD@W9@{UlXm8e|ynwAKItb1jNb}^?!blD(`9E z^S$28osomB?~&ndTk(C)YgAX*)OMMN{G#-r`K*0~8jPP-s>5Uh z+RyG({xZz}GXKl|-(Amf=6{+0W&YQV^GMA9GXI-r0vK^?@sY#)FY~|3umN4VE#{LY znXEW&W4_zoj)$GNx2_P{~nPmMvpc-}N%BlCfp}7jMt$m;>^y zmQzN65qR|>@az`@?sRV$UlCeO#6USbUpp^Mp}AsvD(>P$W#L>v-SsQcZ@(XP^C}@s zpT0OsJQ{6#(k(BF)lM^+d*mwRPL>;+m|9smc^=H~*2==ue&D2K#Lep0JT(;-8GAx# z2=_FCz_$L$yw$Ng?eN&>#MI)G7pl?Yl`7YXZsbKpuF>-p8Bvvix~<9(i|{xC_j>sQ zEQ+?U8p6`AgnjQu<5cDfqb4fzbR!%pbNPWVl{o@5gTGJ~2Z8?lzfmZ}QQwpxCvv2p zhvPqT{Kp_1ZD>yxjHl>Yt#kZG8L+p%H73V@OuoTn7_4&qN0s+$L<_{JD~|uj@gH%E z5BNKd|F~%uFJLJK;qW9=GDunG|2Y05#r~Ah#s~MZmZOmQzw8wh!UwW0U&{8M^hVAb zBftm@5dq2n?Teo3yA+^L#O;g@NX{nW0Q;8OAC>A>7cz=T7O!s&lx^fHArlp#Phaj5 zhkXb@MblJU-v;SmVS;c=Ltp`%smek`!hweH5aL=m2_`Ylfb}68N16ZQ^lOODv8g^!BmUrRC?R7I7AgEBWlF_A6cq=pyZ9#% z1+w@?@gJ$}9Vk*X{^8S9eU1K95PLF+KiNd9E&u#&M7|Wk!2*Bx!#r^k`DlgfqU}?Z z!OC6qCu-mDV@|ek{+rvT&_400+aN{Tcc_UFf64z&FD*Q=wD7e=0WY5+_wS{rmQJiJ zRfWDT^o`ku3v_DSk$d>y$duFXLMnUL@jGqzNtyeQ!+n~Jl}Ln>RJvhX z?T)9);Jbzg#4_7|!u6j0zZZ%<>q%n4J2ig9!O9C_;t%*goa}AK#|2yxU zKZA{B|8MsH?#3;N^RR6H$@ZUY|7jUs?tQ0w%Z}**w*O@NPobrp8oC1| z$<>w<$uL>x^+s7_{x>7KBCr2VFXFs00*t`TiGbw)_Ai}ZT3J~-(Io&E&YpQ@>HNy_ z*)!X_OShzHKt-XwVWBK8uyU2K2&_OUt|M`$UmD%phfJZPFOEJsharrOMEZFcscX`!+fdYnvyGo1}ifX%}I<%kbTh*1ofOhiJw`t_^l zw?o9wH7v$M`6Fn82%bR?d}t2M4+c&2i}c}md-@ad%G90gACZnI(51sYm4+ut$HIP; z6({uiBY=*dwi_L+hNNJpt0%fI^@>~*Plrp_DDo5u5SmZ@77IpNm`5K<#)(UY)i9jd z^^wYL@lX%6GF3Q6CUo0cGn&dQf!UiXOVwU|&b!hUt}4^mMOS#L43nO49E6}yb)$C9lE5$E0 zZW^wa18_@gtE$))zK?yQVF7AOGgX<#=>1BSVccyCQ(c9tT~waa z=T-F(1-xxL%5l6cX0xeitlF|Kik7gHb&ZRQIXS9+YdOPpTg;1H(WUV=CJyBVR$c8F zX2Y~*f7y(9r5nu!u0Y-okU<4QeM&M630#g5fXA_K|Za1Jy z4;O%pl+ionG3mb$IRdGQ?UTj2RmS{*0_`zrlq2=;bWeeP6Vp!jIU^cUsy@^4-g*a7P>-#Uj!C6A9*SbMuoKmIzVa$xyIMfMm8TZX zS6$_*`*PK{c|`8m#T@ly5&dtz7PNrUyO6%Ms3NP7!lH;4xNM?(;)bch3m6gPE5`D* zeR(?Ed`(QQ!Z2T>Hrcf8hLNLu(oDFWs+CV;xw`QJn%yG$^Flh%V#>`8&1q>WmC$$) zvRthg!8XBh3>Z|{;F~bE%%Dcdu%NGv8eX~VEsRA zmVA@7n!Q%bw$$#4zLnI~m*dfutdsTs^d8L{BftnS0*nA7zz8q`uOI{{o?Cp2cRjwJ zJ`eHOM{lCO_%ZO}{TU)IuZX@#{oiii=)J3{^A&Gf{e8VkzpT7_lI3GMu&msqlvAtp z`e@rW*9`smVMY1AoP`x(@fTpx>ebW5&YkstpoT5|3UtXCYhxEcob`W^t10XM)Lx)v z6J4zT3ohQ6w=?Vi`nZ9!{!hhWv;MD5I#S#SW7iVv|BARwv;HqWW(uf*3z^g8qssoj zDxD_#|HfZ}SpUcRzc|mrpBVv0;FW=ZT>oSPYo0h23xCZ`b)43JnLvr{kTeh7ucB|J z1F7{-T3COjjepdO&1}>@wYw9Ainjk9)Ie(enO23?ed*xrX%(8{8`hsm@VrGzeuy%q z+IMjN`X<{Bs@Z(|AC0yD9(?|DkZ*;&7xL#Je*y9rA%6+-ZIEw={AI{X0QftRz7O(U zkoQAA0Qqjn_dq@f`CbU+`zuI44Ed{&7a$*j{58n;LB1dI0}#shgGhe}^23n74*3}5 z{|cY~HRQJ-pN0Gz$iIdBHso`Ve+Qv_zl-$qkS{>~J>)+?{v+h~ApZ&SpCOd* zMWkPZ{8z}AApZ^W-y#14@;@QJ5BUSg|AJ8duR#7UKL0<+A42{J^2d-bL;eKv7062v zUtu&-sYw2RDp(afsQ}m(?CjM5WageuRgvTElUc_t=-S9t{PDwsX1U?qk!mG!Q=+n2 zCDQ#G%+DuXON`~uJQF&H{(YsR=^6*|?-)iuh`bZV0v6d2U3viEsgE#S3>4ll)EbX_H}qE){E8FhJ$@ zw(W<5^t7hZaJ=dWGdHf`rXoykUF%qW_(x^CMS>0%B8`d$)ys`^S14{=VMl@jSi=GtQy4DeVq9$OKnu6P8!g25bfoi5`1Q1F@kf0+M| zsXy5NC#4T6;+j_Ao?U1vXZ~L?fph#%r8`~k%+CBj^Z)ch%NrxW2rvSS03*N%FanIg z^&tRNPGXDKmNEqn$|+jUNZHz`?`EaUGTxGF#VL9{N=pN&n;HvNN>R2|SgRN(4U#k{>;Do~;jI7b zUSKh@nDu{IsIdNTW#!~~*8kvp$&YHr@&DAzQnLP!^?y?|f9FS? zEk1kY2LR>u|N5lF-jz>7MQXv0_2)!bU~k$JqYg6ycpV|Mj2w zKh=Gf*Z<)4Kf+6?$gEOm9?xgWdHoNS7h zGqhjQaZlidUN|F_YGBm&R>$tN!(+j{Z6L<)$qVrtBlCYw0@64(NxFdT|JeRd^Po3S zJp>mq$>I1P3z2bh+;-A4TEgylDtrq$jdT2u^Bn&}-bC{jU5!up!Do*Dk-YJ3YQ8F< ztl{;4`^4tw^?!R}&vX0_1rf&aKREtJf8H*LZpQo{y;1YV2rvS#Xar>ZZ`Y5#Z6f}) zyQ%X*{OyFFbCJS7N|{peuRX;5))0T(MGv%!hiKeRk*X?p577Qk_G#a!H1UrjkQc{b z{{Zd(lZ^H|IA>#%vDc}ZU19w5z4)B=ccOkYzI6rM-~h296`fEvNC!iXaNCM+yI-T{I0Q@VYcRSk z;1YB5?Km$2Z-CsK`B5bYGE&vANUKba|0v^l#vamn{kNov68nF%|98Yqvi&F9e@b?i z*MGBZQ)N*-&io(qf3Zgk=KuP|9pw0r%2+<^|9!ol*3x3r^)$ybtmf?OY<1akJ*U$e zAa0|q?Rt9^_sZ96<@7CCXQ3X_+b(a603-0~L_qR?({izsE@9^z%z^zgniSu+*9Ndp z2@rWfiEc$P=I@K6MC8%dr}V&$DGQ;SbtNODZ<|IPm2?Efu! z6}JDANU;4M+y5o+6yr^b)S@QcHVjiq%M~%QV*9_5N){B^bX7$Bfto}IuVfk->$bk zz5EnWcFSiD&({{0PQLA})sAPFy}VyW&MC^-pYJ15@5^20Z&xC7Z2f2Y0Vr!g5+)1n zO%z(Nt&89!4cqFMKiMO!-Mj`nmVTK-4zMy(*;-k6T63DhTlPdNSx3lXQYSOcfOhxm zBOOcD750Y?l+QmFHViB?;{?_qT{D`hm$Tl8VE*GD^MB0$G5;r7FXsOw5`~EbUjLcb ze-7`Wy#9;It+CnCTgoWA@GkW{Q|WBZ{9o^53^|OqZO3y}Pd{w`*N;+W`#RH;=i;FDEp zAO_^6p7zo^?j4~0--)%qh&ER%oo?jEbp3hX5r45Vj!e5DMdL627pin0{i#$Iah5vT zZ=oL+Vn7y;JQGsA)^qI(8ouu_q1Q33vW zA^=VGlE(huNsBA?|7QPh_WzD~aq{{(L%8)ng6BtLf#kwMxY=9Bb8A&`w*e$TR$$C?kTgeV%n?YAz4H9 zj9jfoj8m{Z_O4j)zVq0Ij= z|Hu3v^MAc-HgWt%j{msG{NDt{vtj#B)iXr?N=d67!&KTO7hk<9-vE3fc!yB+nAiVS znt=BjKvR6Mdc@b2Bw#(_4tnGSxmE`Km>07eSLOrCHW!@M8M&Q+n zK((?3|Kgi8?UVbCJ%2#0ejwNEx@6;^u$a{kyu0@J;kiSy21-k+b^eh@UWQr^KRicq zDHWD^)ac!i(aOlq~d*{Yqx8lbf$$FUuG1nYfYn>=IJ zPK%c9T#AvlhfS*5mcP0mt{9u`L~EU|1b()kL+IbJrEL^@9S$4`S>67{pl|Sd8AclZwWDS9@Aj^*6jMJqb8o_8=eCny%8QZI!qMug6 zaS})Fpd-szlh(k%cvqmBJf)$bZmw^xw65(u?X&m2ReTE$?ndAPT{Jq5=si9`{gOZA z6BsF`Z+uKW(B0PO_ntO%$9C;CueR{ugS~?m*($f<-}vgxaYR(Irreq1t7|jI*D!E! zLCqYuV9`9$nGZfx@1sv^rq*<~eQs4amo$C7V>J(rR(3cu$0_h0ic^VOY<+CCv$iIj z@lLR3>l@$HX+IErj+dRURN`L`C%+yUsr&>k_n-4Gd4-cE`+rM|-ol1N?Ej6~+-_Y_ zz0wwcgXZ<0dHrX_{KWp>z4Qn3f2yg6`M-XS?^`!)hwcB^{!h&E`Y-hO&Ko1Z2rvSS z03*N%+#m!-K(O5c*#fy0LSb6RAmfk;$Rwl+*$UYP*$&wOxec-tayw)fWH)3AvIjB^ z*$deRxdXBvawp_2$V;RM;O(YCU<{1pn=6lxed5-~Dj!aaxrKuuS}VW#u^+gVcApE= zM3z2ZKD~*&vWicB?DwID`YHrEk8UcD-Z5L(?N-aS>VesKJ&Z3ftKawh;UkY6J$mes z#hD|=mQKzbI<#U zegx{8_aVdA+%PDvA$G_Kw4BtiVTT`7WJfHeeY8z?q44!?otCL}yxH~po}WLlH2?64 z!;3SA9zOLDa9Et1IdSUHNy1@n;n>`%V~a~ib8xUwKgllvhtC3sM~95V{piaP$nIE* zkN%d8L%HMO6Cn=AZWs=2oLldB_&V%e3r@S6hF@djA-pumVWOn*a1xD>yb$8>$dGaP zG4$mcgtlw`-{{ZY?sXC3(9)WQUeW|1n|XT(#KS`dLdQJmL1>d{@C|p{G!VXh9j$v? z&c*Qp8Y20F5R0Qj#)8g!EB(PH)8HE>jxHAdWNF%nP+rPRDeo9^hInYmAp8c-_(jO; zVyOh-&MpWtuuokNB9@jkB4k5PU_|~NM#YgKgF*e-1;HJxo6sa;1lS}e)LJE_~>u@xeulchwW)p13qRT2~@(GJPChfo|EG8At?UyShFWg331M1vxj zEH$gyf!$F_NXX0M8$u-JhKvNAbr^%Nn@S|2X9*vPrfoM2f$+|y-a0;jE8}yxMh^}d z2n~I>453Y?!8g3YcjpQDa7nH}WzCrKb%S2J2#MJtBT>g`(*rndG7Y}PU%Nsi$VjN9 z5g{)PdFPlJG7fadcpyA+nMxd@5z&2^Fttl%T^q8MvltO{4?QqsBtDKl{3HY>e|}2g zF6DL{@9eN=YdTu1MlOPGJu*>y#&A2Zd0g>24a2TKqaS;uzHI4cry=SqUc)q2OBy-y zPWya_*Mlz`UeDsR=`~b+(u56RMH4HfuZ74h8ac_^OF6TuyoPAx&|LDS8-_&oEBk{u z?MERnYxGm1a^yDn$idoFC5;?8_x@}+avr#0cx7KMp9DCc3IUR-#48#(@)<2y%A%b2 zSvhj#?EA(WhD7$rp=;-LkZrM4A`y{Z;a$kpE|x|1$hl+(M#Kxag6>b@0JCve*Iui;(xN}++}NFW5B0s{A?5Gaoke-p& zKq+N7oJ92`kA}nH^+QJBXV8yp5SkcdDiMgL$nJxB(|5%w1qnGd$j6M=4H=0q;o|&5 z2yHSAzV&-hFK0xgakzKLIE-OZn1Z|>CofZp!zLdx796j>;^_62)pen@OS*#66Y6Vk z7+%>A86AN0o)93JO1$2pezHwJ&P%)&SDPgQCI?szm-!PI;I$zGrtbuc2f=?om4pd_ zc281gsnvrxU|~}72$BzH_Y4^j8z=reojo?02H!Ht5`PXZ=LJXJkJrMx(cL!;iR{O- z*I-N>pmBjsrolJ7`lV?jKj^~CG$dX#WFY=%6i;Skw17>f!8f>!rh$MJ0~Xl}V^EZH zQ<7~-&g8Bk!tJvpAmp7yKC=E!!8?7%42q)a6c(8)QV z&p?j30KsayrM=Omhr=By6mIkz9i4F%LT_?1rG2#B)q8C~P3!yFmOLgj49L&ox7asi zH0E&Di~hMsY4|mE3rVP8%9%1xq7@RlIEXCVJ7gff4OU1o3k+!g{Rkan`1r>hsx4hh{iXhiH8G88|LzWjE0?lKL( z##GiRD9RZX^3Fkz+yuqckfHcioc9MI^oS)>2?dBBc?&I(_>r%zL@f{#x_ih7{3xb| zUxrY>WGWHpvG!`&7X`%^De0aev9K^2=$^4_$XL7+I6Mcr2LQ-aV$s8nQ@rVtaFDNG z=YRu^iQ9*a!^d&bKLxojmiEP=O~ES5ogLmAj)$E?#^F8a$A=-b$u#(u@fsRL8Y~A0 z`DppM5Qy7`3+FvW}%WbH_~#MGrL*MxQJNi1=hl zKy1H>f#|t$bj^gz85Hs{f+h;WV%trOMbDtnJC0k{qvc6l9wcN$Pe5$FiGk>uD5RfF zIb%Z3nZ#kzO|<$-f+CD0RnnX(r;1~MVhS>O6GPE+c{Cln(=G{!xFtPZ9uqeK5VwbS zG?~g9T#uF&T&`!9Wg#n(phrwHKN!CWkl2q?hl0^JBBxYt{g5bUo{$gQCnxc#zMP(oF4^n*axLHX?IZnMzC|b(c?KOP8ba40B{dQujA9WH8R6L&V(DZ9}HA zkI|s;!3bAlFK1B58-`SlgA0(&`st0HE@_%PAND||vO^dYlCvbWU)wei@73`Tigc3{ z4JHEru0)>fv`KGv3C3<@_#Mm?%I%mK`RJ!U@|j!iI%O*J@j*s_5nu!u0Y-okU<4Qe TMt~7u1Q-EEfDw4*BJlqKA`;U+ diff --git a/src/eressea/eressea-6.dsp b/src/eressea/eressea-6.dsp index b304072f7..9b12c2e1c 100644 --- a/src/eressea/eressea-6.dsp +++ b/src/eressea/eressea-6.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "CONVERT_TRIGGER" /FR /YX /FD /c +# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "NDEBUG" /FR /YX /FD /c # ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" BSC32=bscmake.exe @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Gm /ZI /Od /I ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "BETA_CODE" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Gm /ZI /Od /I "../common/gamecode" /I "../common/kernel" /I "../common/util" /I ".." /I "../common" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "BETA_CODE" /FR /YX"stdafx.h" /FD /c # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -170,6 +170,8 @@ SOURCE=.\old\pointertags.c !IF "$(CFG)" == "eressea - Win32 Release" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "eressea - Win32 Debug" # PROP Exclude_From_Build 1 @@ -190,6 +192,8 @@ SOURCE=.\old\pointertags.h !IF "$(CFG)" == "eressea - Win32 Release" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "eressea - Win32 Debug" # PROP Exclude_From_Build 1 @@ -210,6 +214,8 @@ SOURCE=.\old\relation.c !IF "$(CFG)" == "eressea - Win32 Release" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "eressea - Win32 Debug" # PROP Exclude_From_Build 1 @@ -230,6 +236,8 @@ SOURCE=.\old\relation.h !IF "$(CFG)" == "eressea - Win32 Release" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "eressea - Win32 Debug" # PROP Exclude_From_Build 1 @@ -250,6 +258,8 @@ SOURCE=.\old\trigger.c !IF "$(CFG)" == "eressea - Win32 Release" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "eressea - Win32 Debug" # PROP Exclude_From_Build 1 @@ -270,6 +280,8 @@ SOURCE=.\old\trigger.h !IF "$(CFG)" == "eressea - Win32 Release" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "eressea - Win32 Debug" # PROP Exclude_From_Build 1