From 3101acdb8394983f4f3ce636f548baae5e763bb1 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 9 Apr 2004 01:32:06 +0000 Subject: [PATCH] fix project file, some indenting --- src/common/gamecode/laws.c | 47 +++++++++++++++++++------------------- src/common/kernel/region.c | 2 +- src/eressea.sln | 46 +++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 24 deletions(-) diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index d690f5fcb..01fd48fec 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -292,36 +292,37 @@ get_food(region *r) static void live(region * r) { - unit **up = &r->units; + unit **up = &r->units; - get_food(r); + get_food(r); - while (*up) { + while (*up) { unit * u = *up; - /* IUW: age_unit() kann u löschen, u->next ist dann - * undefiniert, also müssen wir hier schon das nächste - * Element bestimmen */ + /* IUW: age_unit() kann u löschen, u->next ist dann + * undefiniert, also müssen wir hier schon das nächste + * Element bestimmen */ - int effect = get_effect(u, oldpotiontype[P_FOOL]); - if (effect > 0) { /* Trank "Dumpfbackenbrot" */ - skill * sv = u->skills, * sb = NULL; - while (sv!=u->skills+u->skill_size) { - if (sb==NULL || skill_compare(sv, sb)>0) { - sb = sv; - } - ++sv; - } /* bestes Talent raussuchen */ - if (sb!=NULL) { - int weeks = min(effect, u->number); - reduce_skill(u, sb, weeks); - ADDMSG(&u->faction->msgs, msg_message("dumbeffect", - "unit weeks skill", u, weeks, (skill_t)sb->id)); - } /* sonst Glück gehabt: wer nix weiß, kann nix vergessen... */ + int effect = get_effect(u, oldpotiontype[P_FOOL]); + if (effect > 0) { /* Trank "Dumpfbackenbrot" */ + skill * sv = u->skills, * sb = NULL; + while (sv!=u->skills+u->skill_size) { + if (sb==NULL || skill_compare(sv, sb)>0) { + sb = sv; + } + ++sv; + } + /* bestes Talent raussuchen */ + if (sb!=NULL) { + int weeks = min(effect, u->number); + reduce_skill(u, sb, weeks); + ADDMSG(&u->faction->msgs, msg_message("dumbeffect", + "unit weeks skill", u, weeks, (skill_t)sb->id)); + } /* sonst Glück gehabt: wer nix weiß, kann nix vergessen... */ change_effect(u, oldpotiontype[P_FOOL], -effect); - } + } age_unit(r, u); if (*up==u) up=&u->next; - } + } } /* diff --git a/src/common/kernel/region.c b/src/common/kernel/region.c index fa0cad3c5..1502afbf9 100644 --- a/src/common/kernel/region.c +++ b/src/common/kernel/region.c @@ -169,7 +169,7 @@ a_agedirection(attrib *a) { spec_direction *d = (spec_direction *)(a->data.v); - if(d->duration > 0) d->duration--; + if (d->duration > 0) d->duration--; else d->duration = 0; return d->duration; diff --git a/src/eressea.sln b/src/eressea.sln index 0056cc529..9fad009a8 100644 --- a/src/eressea.sln +++ b/src/eressea.sln @@ -1,15 +1,42 @@ Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attributes", "common\attributes\attributes.vcproj", "{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea\eressea.vcproj", "{B859D542-781E-4647-BCAB-3FE5ED077366}" + ProjectSection(ProjectDependencies) = postProject + {C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD} + {79659D44-EC28-42B9-9475-6C0D62D0AAE0} = {79659D44-EC28-42B9-9475-6C0D62D0AAE0} + {EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198} + {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} + {601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5} + {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} + {0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97} + {330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3} + {4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common\gamecode\gamecode.vcproj", "{79659D44-EC28-42B9-9475-6C0D62D0AAE0}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "items", "common\items\items.vcproj", "{C14E3D2B-8189-4570-A4E3-9010C873E4FD}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common\kernel\kernel.vcproj", "{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapper", "mapper\mapper.vcproj", "{17F83AAB-352D-4F68-ADA6-09F36D86826F}" ProjectSection(ProjectDependencies) = postProject + {C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD} {EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198} {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} {601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5} {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} {0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97} + {330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3} {4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00} EndProjectSection EndProject @@ -35,11 +62,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util\util.vc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea-lua", "eressea\eressea-lua.vcproj", "{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}" ProjectSection(ProjectDependencies) = postProject + {C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD} + {79659D44-EC28-42B9-9475-6C0D62D0AAE0} = {79659D44-EC28-42B9-9475-6C0D62D0AAE0} {EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198} {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} {601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5} {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} {0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97} + {330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3} {4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00} EndProjectSection EndProject @@ -49,6 +79,22 @@ Global Release = Release EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution + {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.ActiveCfg = Debug|Win32 + {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.Build.0 = Debug|Win32 + {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Release.ActiveCfg = Release|Win32 + {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Release.Build.0 = Release|Win32 + {B859D542-781E-4647-BCAB-3FE5ED077366}.Debug.ActiveCfg = Debug|Win32 + {B859D542-781E-4647-BCAB-3FE5ED077366}.Debug.Build.0 = Debug|Win32 + {B859D542-781E-4647-BCAB-3FE5ED077366}.Release.ActiveCfg = Release|Win32 + {B859D542-781E-4647-BCAB-3FE5ED077366}.Release.Build.0 = Release|Win32 + {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Debug.ActiveCfg = Debug|Win32 + {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Debug.Build.0 = Debug|Win32 + {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Release.ActiveCfg = Release|Win32 + {79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Release.Build.0 = Release|Win32 + {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Debug.ActiveCfg = Debug|Win32 + {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Debug.Build.0 = Debug|Win32 + {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Release.ActiveCfg = Release|Win32 + {C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Release.Build.0 = Release|Win32 {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Debug.ActiveCfg = Debug|Win32 {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Debug.Build.0 = Debug|Win32 {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Release.ActiveCfg = Release|Win32