文字化け対策

diff --git a/src/basemode/activate.cpp b/src/basemode/activate.cpp
index d0f0e7a..a913c4d 100644 (file)
--- a/src/basemode/activate.cpp
+++ b/src/basemode/activate.cpp
@@ -90,7 +90,7 @@ void activate()
    while(true)
    {
       music.play(MUSIC_ACTIVATE);
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       printfunds();
@@ -108,7 +108,7 @@ void activate()
          set_color(COLOR_WHITE,COLOR_BLACK,0);
          move(y,0);
          addchar(y+'A'-2);addstr(" - ");
-         addstr(temppool[p]->name);
+         addstr(to_half(temppool[p]->name));
 
          char bright=0;
          int skill=0;
@@ -315,7 +315,7 @@ void activate(Creature *cr)
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       printfunds();
@@ -1094,7 +1094,7 @@ void activatebulk()
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       printfunds();
@@ -1137,7 +1137,7 @@ void activatebulk()
          set_color(COLOR_WHITE,COLOR_BLACK,0);
          move(y,0);
          addchar(y+'A'-2);addstr(" - ");
-         addstr(temppool[p]->name);
+         addstr(to_half(temppool[p]->name));
 
          move(y,25);
          set_activity_color(temppool[p]->activity.type);
@@ -1257,7 +1257,7 @@ void select_tendhostage(Creature *cr)
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       move(0,0);
@@ -1274,7 +1274,7 @@ void select_tendhostage(Creature *cr)
          set_color(COLOR_WHITE,COLOR_BLACK,0);
          move(y,0);
          addchar(y+'A'-2);addstr(" - ");
-         addstr(temppool[p]->name);
+         addstr(to_half(temppool[p]->name));
 
          char bright=0;
          int skill=0;
@@ -1465,7 +1465,7 @@ void recruitSelect(Creature &cr)
    int page=0;
    while(true)
    {
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(0,0);
       addstr(cr.name);
@@ -1585,7 +1585,7 @@ void select_makeclothing(Creature *cr)
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(0,0);

diff --git a/src/basemode/activate_sleepers.cpp b/src/basemode/activate_sleepers.cpp
index 8ffa65e..e3d9294 100644 (file)
--- a/src/basemode/activate_sleepers.cpp
+++ b/src/basemode/activate_sleepers.cpp
@@ -68,7 +68,7 @@ void activate_sleepers()
       {
          set_color(COLOR_WHITE,COLOR_BLACK,0);
          mvaddchar(y,0,(y-2)/2+'A');addstr(" - ");
-         addstr(temppool[p]->name);
+         addstr(to_half(temppool[p]->name));
 
          move(y,25);
          addstr(temppool[p]->get_type_name());

diff --git a/src/basemode/baseactions.cpp b/src/basemode/baseactions.cpp
index 79687a2..c0a10d9 100644 (file)
--- a/src/basemode/baseactions.cpp
+++ b/src/basemode/baseactions.cpp
@@ -252,7 +252,7 @@ void stopevil()
    while(true)
    {
       music.play(MUSIC_STOPEVIL);
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       mvaddstr(0,0,"部隊はどこへ向かうか?");
@@ -479,7 +479,7 @@ void investlocation()
 
    while(true)
    {
-      erase();
+      clear();
 
       locheader();
       printlocation(loc);
@@ -814,7 +814,7 @@ void setvehicles()
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       mvaddstr(0,0,"リベラル自動車の選択");

diff --git a/src/basemode/basemode.cpp b/src/basemode/basemode.cpp
index 2b1ebe9..7b63356 100644 (file)
--- a/src/basemode/basemode.cpp
+++ b/src/basemode/basemode.cpp
@@ -74,7 +74,7 @@ bool show_disbanding_screen(int& oldforcemonth)
          pool[p]->alive=0; // Kill for the purposes of disbanding all contacts below
    }
    oldforcemonth=month;
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    mvaddstr(0,0,year);
    addstr("年");
@@ -262,7 +262,7 @@ void mode_base()
          if(nonsighttime>=365*4)
          {
             music.play(MUSIC_BASEMODE);
-            erase();
+            clear();
             char str[100];
             if(nonsighttime>=365*16)
                strcpy(str,"どれだけの時が流れただろうか…時代は変わった。");
@@ -335,7 +335,7 @@ void mode_base()
 
       if(!forcewait)
       {
-         erase();
+         clear();
 
          if(activesquad!=NULL) selectedsiege=-1;
 
@@ -566,7 +566,7 @@ void mode_base()
          advancelocations();
          if(forcewait)
          {
-            erase();
+            clear();
             set_color(COLOR_WHITE,COLOR_BLACK,0);
             mvaddstr(7,5,"時は流れる…",gamelog);
             mvaddstr(9,12,year,gamelog);

diff --git a/src/basemode/liberalagenda.cpp b/src/basemode/liberalagenda.cpp
index 8a73324..c353eaf 100644 (file)
--- a/src/basemode/liberalagenda.cpp
+++ b/src/basemode/liberalagenda.cpp
@@ -51,7 +51,7 @@ bool liberalagenda(signed char won)
 
    while(true)
    {
-      erase();
+      clear();
       if(won==1)
       {
          set_color(COLOR_GREEN,COLOR_BLACK,1);
@@ -227,7 +227,7 @@ bool liberalagenda(signed char won)
             for(int c=0;c<COURTNUM;c++,y++)
             {
                set_alignment_color(court[c],true);
-               mvaddstr(y,60,courtname[c]);
+               mvaddstr(y,60,to_half(courtname[c]));
             }
          }
          for(int l=0;l<LAWNUM;l++)
@@ -657,7 +657,7 @@ bool confirmdisband()                      // concerned should be (slightly) mor
 
    for(int pos=0;pos<len(word);)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       mvaddstr(0,0,"本当に解散するか?");

diff --git a/src/basemode/reviewmode.cpp b/src/basemode/reviewmode.cpp
index c259fe9..81c0381 100644 (file)
--- a/src/basemode/reviewmode.cpp
+++ b/src/basemode/reviewmode.cpp
@@ -69,7 +69,7 @@ void review()
    while(true)
    {
       music.play(MUSIC_REVIEWMODE);
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       mvaddstr(0,0,"リベラルの確認と部隊の編成を行う");
@@ -219,7 +219,7 @@ void review()
       {
           char clearformess=false;
           fundreport(clearformess);
-          if(clearformess) erase();
+          if(clearformess) clear();
       }
       if(c=='y') music.enableIf(!music.isEnabled());
    }
@@ -276,7 +276,7 @@ void review_mode(short mode)
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       move(0,0);
@@ -338,7 +338,7 @@ void review_mode(short mode)
       {
          set_color(COLOR_WHITE,COLOR_BLACK,0);
          mvaddchar(y,0,y+'A'-2);addstr(" - ");
-         addstr(temppool[p]->name);
+         addstr(to_half(temppool[p]->name));
 
          char bright=0;
          int skill=0;
@@ -502,7 +502,7 @@ void review_mode(short mode)
             //const int pagenum=2;
             while(true)
             {
-               erase();
+               clear();
 
                move(0,0);
                if(temppool[p]->align!=1)
@@ -859,7 +859,7 @@ void assemblesquad(squadst *cursquad)
    {
       partysize=squadsize(cursquad);
 
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       move(0,0);
@@ -886,7 +886,7 @@ void assemblesquad(squadst *cursquad)
       {
          set_color(COLOR_WHITE,COLOR_BLACK,0);
          mvaddchar(y,0,y+'A'-2);addstr(" - ");
-         addstr(temppool[p]->name);
+         addstr(to_half(temppool[p]->name));
 
          char bright=0;
          int skill=0;
@@ -1163,7 +1163,7 @@ void squadlessbaseassign()
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       printfunds();
@@ -1186,11 +1186,11 @@ void squadlessbaseassign()
             set_color(COLOR_BLACK,COLOR_BLACK,1);
          else set_color(COLOR_WHITE,COLOR_BLACK,0);
          mvaddchar(y,0,y+'A'-2);addstr(" - ");
-         addstr(temppool[p]->name);
+         addstr(to_half(temppool[p]->name));
 
          mvaddstr(y,25,location[temppool[p]->base]->getname(true, true));
          if(location[temppool[p]->base]->siege.siege)
-            addstr(" <Under Siege>");
+            addstr(" <包囲中>");
       }
 
       y=2;
@@ -1314,7 +1314,7 @@ static void printname(Creature &cr)
 
    // add name
    set_color(namecolor,COLOR_BLACK,brightness);
-   addstr(cr.name);
+   addstr(to_half(cr.name));
 
    // add close bracket (if used)
    if(cr.flag & CREATUREFLAG_SLEEPER)
@@ -1351,7 +1351,7 @@ void promoteliberals()
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       printfunds();

diff --git a/src/combat/chase.cpp b/src/combat/chase.cpp
index de521c3..b2a119e 100644 (file)
--- a/src/combat/chase.cpp
+++ b/src/combat/chase.cpp
@@ -74,7 +74,7 @@ bool chasesequence()
    mode=GAMEMODE_CHASECAR;
    music.play(MUSIC_CARCHASE);
 
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(0,0);
    addstr("この場所から引き上げるとき、保守に付けられているのを感じた!", gamelog);
@@ -92,7 +92,7 @@ bool chasesequence()
       int partysize=squadsize(activesquad),partyalive=squadalive(activesquad),encsize=0;
       for(int e=0;e<ENCMAX;e++) if(encounter[e].exists) encsize++;
 
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       mvaddstr(0,0,location[chaseseq.location]->getname());
@@ -398,7 +398,7 @@ bool footchase()
    mode=GAMEMODE_CHASEFOOT;
    music.play(MUSIC_FOOTCHASE);
 
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(0,0);
    addstr("建物を出ると、保守に付けられているのを感じた!", gamelog);
@@ -411,7 +411,7 @@ bool footchase()
       int partysize=squadsize(activesquad),partyalive=squadalive(activesquad),encsize=0;
       for(int e=0;e<ENCMAX;e++) if(encounter[e].exists) encsize++;
 
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       mvaddstr(0,0,location[chaseseq.location]->getname());

diff --git a/src/combat/haulkidnap.cpp b/src/combat/haulkidnap.cpp
index a6895e1..d079be6 100644 (file)
--- a/src/combat/haulkidnap.cpp
+++ b/src/combat/haulkidnap.cpp
@@ -550,7 +550,7 @@ void kidnaptransfer(Creature &cr)
    //Create interrogation data
    newcr->activity.intr()=new interrogation;
 
-   erase();
+   clear();
 
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(0,0);

diff --git a/src/common/commonactions.cpp b/src/common/commonactions.cpp
index fc111e8..0557c90 100644 (file)
--- a/src/common/commonactions.cpp
+++ b/src/common/commonactions.cpp
@@ -680,7 +680,7 @@ bool sort_squadorname(const Creature* first, const Creature* second)
 /* common - Prompt to decide how to sort liberals.*/
 void sorting_prompt(short listforsorting)
 {
-   erase();
+   clear();
    move(1,1);
    set_color(COLOR_WHITE,COLOR_BLACK,0);
    switch(listforsorting)
@@ -751,7 +751,7 @@ int choiceprompt(const string &firstline, const string &secondline,
 
    while(true)
    {
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(0,0);
       addstr(firstline);
@@ -809,7 +809,7 @@ int buyprompt(const string &firstline, const string &secondline,
 
    while(true)
    {
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       move(0,0);
       addstr(firstline);

diff --git a/src/common/commondisplay.cpp b/src/common/commondisplay.cpp
index 37f0e68..a18eadf 100644 (file)
--- a/src/common/commondisplay.cpp
+++ b/src/common/commondisplay.cpp
@@ -355,7 +355,7 @@ void printparty()
             if(party[p]->prisoner!=NULL)set_color(COLOR_MAGENTA,COLOR_BLACK,1);
             else set_color(COLOR_WHITE,COLOR_BLACK,0);
             move(p+2,2);
-            addstr(party[p]->name);
+            addstr(to_half(party[p]->name));
             if(party[p]->prisoner!=NULL)addstr("+H");
 
             int skill=0;

diff --git a/src/common/equipment.cpp b/src/common/equipment.cpp
index c493526..747ae4f 100644 (file)
--- a/src/common/equipment.cpp
+++ b/src/common/equipment.cpp
@@ -94,7 +94,7 @@ void equip(vector<Item *> &loot,int loc)
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       move(0,0);
@@ -396,7 +396,7 @@ void moveloot(vector<Item *> &dest,vector<Item *> &source)
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       move(0,0);
@@ -517,7 +517,7 @@ void equipmentbaseassign()
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       printfunds();

diff --git a/src/common/help.cpp b/src/common/help.cpp
index ba187bc..3bcbd88 100644 (file)
--- a/src/common/help.cpp
+++ b/src/common/help.cpp
@@ -32,7 +32,7 @@ ACTIVITY_SLEEPER_JOINLCS, TODO
 // changes that will change gameplay.
 void help(const char* string)
 {
-   erase();
+   clear();
 }
 
 // Generates help page on activities.
@@ -50,7 +50,7 @@ void HelpActivities(int activityType)
       return;
    }
 
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,0);
    move(0,0);
    addstr("リベラル・ヘルプ");

diff --git a/src/common/misc.cpp b/src/common/misc.cpp
index 0c8193b..7546956 100644 (file)
--- a/src/common/misc.cpp
+++ b/src/common/misc.cpp
@@ -416,7 +416,7 @@ bool Interval::set_interval(const string& interval)
 /* helper function for initsongs() */
 void MusicClass::loadsong(int i,const char* filename)
 {  // the reason it prints progress on the screen is because it might be a little slow sometimes so this reassures the user progress is being made
-   erase();
+   clear();
    if(oggsupport)
    {
       mvaddstr(12,0,"Loading Ogg Vorbis music ("+tostring(i+1)+"/"+tostring(MUSIC_OFF)+"): "+artdir+"ogg/"+filename+".ogg");
@@ -540,7 +540,7 @@ void MusicClass::init()
    loadsong(MUSIC_REAGANIFIED,"reaganified"); // load Reaganified music
    // stalinized.ogg or .mid - The Soviet (and now Russian) National Anthem by Alexander Vasilyevich Alexandrov
    loadsong(MUSIC_STALINIZED,"stalinized"); // load Stalinized music
-   erase();
+   clear();
    refresh();
    songsinitialized=true;
 #endif // DONT_INCLUDE_SDL

diff --git a/src/daily/activities.cpp b/src/daily/activities.cpp
index fb03da0..214a96c 100644 (file)
--- a/src/daily/activities.cpp
+++ b/src/daily/activities.cpp
@@ -248,7 +248,7 @@ void repairarmor(Creature &cr,char &clearformess)
                }
             }
 
-   if(clearformess) erase();
+   if(clearformess) clear();
    else makedelimiter();
 
    if(armor==NULL)
@@ -391,7 +391,7 @@ void makearmor(Creature &cr,char &clearformess)
 
    if(ledger.get_funds()<hcost)
    {
-      if(clearformess) erase();
+      if(clearformess) clear();
       else makedelimiter();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -434,7 +434,7 @@ void makearmor(Creature &cr,char &clearformess)
 
       if(!foundcloth&&ledger.get_funds()<cost)
       {
-         if(clearformess) erase();
+         if(clearformess) clear();
          else makedelimiter();
 
          set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -456,7 +456,7 @@ void makearmor(Creature &cr,char &clearformess)
          while (LCSrandom(10)<dif && quality <= armortype[at]->get_quality_levels())
             quality++;
 
-         if(clearformess) erase();
+         if(clearformess) clear();
          else makedelimiter();
 
          Item *it=new Armor(*armortype[at],quality);
@@ -545,7 +545,7 @@ void survey(Creature *cr)
       if(v==VIEW_LIBERALCRIMESQUADPOS&&survey[VIEW_LIBERALCRIMESQUAD]<=0) survey[v]=-1;
    }
 
-   erase();
+   clear();
 
    //TODO: Sort out the gamelog for this.
    set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -825,7 +825,7 @@ void attemptarrest(Creature & liberal,const char* string,int clearformess)
 {
    if(string)
    {
-      if(clearformess) erase();
+      if(clearformess) clear();
       else makedelimiter();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -1385,7 +1385,7 @@ void doActivityHacking(vector<Creature *> &hack, char &clearformess)
 
       if(msg[0])
       {
-         if(clearformess) erase();
+         if(clearformess) clear();
          else makedelimiter();
 
          set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -1428,7 +1428,7 @@ void doActivityHacking(vector<Creature *> &hack, char &clearformess)
 
          if(msg[0])
          {
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
 
             set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -1456,7 +1456,7 @@ void doActivityGraffiti(vector<Creature *> &graffiti, char &clearformess)
          if(!graffiti[s]->get_weapon().can_graffiti())
          {
 
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
 
             set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -1512,13 +1512,13 @@ void doActivityGraffiti(vector<Creature *> &graffiti, char &clearformess)
 
          int issue=VIEW_LIBERALCRIMESQUAD,power=1;
 
-         if(clearformess) erase();
+         if(clearformess) clear();
          else makedelimiter();
 
          if(!LCSrandom(10) &&
             !(graffiti[s]->skill_check(SKILL_STREETSENSE,DIFFICULTY_AVERAGE)))
          {
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
 
             set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -1656,7 +1656,7 @@ void doActivityProstitution(vector<Creature *> &prostitutes, char &clearformess)
       {
          if(!(prostitutes[p]->skill_check(SKILL_STREETSENSE,DIFFICULTY_AVERAGE))) // Street sense to avoid
          {
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
 
             set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -1680,7 +1680,7 @@ void doActivityProstitution(vector<Creature *> &prostitutes, char &clearformess)
          }
          else
          {
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
 
             set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -1798,7 +1798,7 @@ void doActivityTrouble(vector<Creature *> &trouble, char &clearformess)
       char done=0;
       short crime=0;
 
-      if(clearformess) erase();
+      if(clearformess) clear();
       else makedelimiter();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -1974,7 +1974,7 @@ void doActivityTrouble(vector<Creature *> &trouble, char &clearformess)
             if(!LCSrandom(30) &&
                !(trouble[t]->skill_check(SKILL_STREETSENSE,DIFFICULTY_AVERAGE)))
             {
-               if(clearformess) erase();
+               if(clearformess) clear();
                else makedelimiter();
 
                if(!LCSrandom(4))
@@ -2001,7 +2001,7 @@ void doActivityTrouble(vector<Creature *> &trouble, char &clearformess)
 
                   if(trouble[t]->get_weapon().is_threatening())
                   {
-                     if(clearformess) erase();
+                     if(clearformess) clear();
                      else makedelimiter();
 
                      set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -2014,7 +2014,7 @@ void doActivityTrouble(vector<Creature *> &trouble, char &clearformess)
 
                      getkey();
 
-                     if(clearformess) erase();
+                     if(clearformess) clear();
                      else makedelimiter();
 
                      set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -2032,7 +2032,7 @@ void doActivityTrouble(vector<Creature *> &trouble, char &clearformess)
                   {
                      for(int count=0;count<=LCSrandom(5)+2;count++)
                      {
-                        if(clearformess) erase();
+                        if(clearformess) clear();
                         else makedelimiter();
                         if(trouble[t]->skill_roll(SKILL_HANDTOHAND)>LCSrandom(6)+count)
                         {
@@ -2086,7 +2086,7 @@ void doActivityTrouble(vector<Creature *> &trouble, char &clearformess)
 
                      if(wonfight)
                      {
-                        if(clearformess) erase();
+                        if(clearformess) clear();
                         else makedelimiter();
                         set_color(COLOR_GREEN,COLOR_BLACK,1);
                         move(8,1);
@@ -2108,7 +2108,7 @@ void doActivityTrouble(vector<Creature *> &trouble, char &clearformess)
 
                   if(!wonfight)
                   {
-                     if(clearformess) erase();
+                     if(clearformess) clear();
                      else makedelimiter();
                      set_color(COLOR_RED,COLOR_BLACK,1);
                      move(8,1);
@@ -2125,7 +2125,7 @@ void doActivityTrouble(vector<Creature *> &trouble, char &clearformess)
 
                      if(!LCSrandom(5))
                      {
-                        if(clearformess) erase();
+                        if(clearformess) clear();
                         else makedelimiter();
                         switch(LCSrandom(10))
                         {
@@ -2433,7 +2433,7 @@ bool stealcar(Creature &cr,char &clearformess)
       cr.train(SKILL_STREETSENSE,5);
 
       //THEFT SEQUENCE
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(0,0);
       addstr("車泥棒の冒険", gamelog);
@@ -2471,7 +2471,7 @@ bool stealcar(Creature &cr,char &clearformess)
       getkey();
 
       //APPROACH?
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(0,0);
       addstr("車泥棒の冒険");
@@ -2506,7 +2506,7 @@ bool stealcar(Creature &cr,char &clearformess)
 
       for(bool entered=false;!entered;)
       {
-         erase();
+         clear();
          set_color(COLOR_WHITE,COLOR_BLACK,1);
          move(0,0);
          addstr("車泥棒の冒険");
@@ -2710,7 +2710,7 @@ bool stealcar(Creature &cr,char &clearformess)
       for(bool started=false;!started;)
       {
          nervous_counter++;
-         erase();
+         clear();
          set_color(COLOR_WHITE,COLOR_BLACK,1);
          move(0,0);
          addstr("リベラル車泥棒の冒険");
@@ -2999,7 +2999,7 @@ bool carselect(Creature &cr,short &cartype)
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(0,0);
@@ -3104,7 +3104,7 @@ bool carselect(Creature &cr,short &cartype)
 /* get a wheelchair */
 void getwheelchair(Creature &cr,char &clearformess)
 {
-   if(clearformess) erase();
+   if(clearformess) clear();
    else makedelimiter();
 
    if(LCSrandom(2))

diff --git a/src/daily/daily.cpp b/src/daily/daily.cpp
index 5a5760a..de30f8e 100644 (file)
--- a/src/daily/daily.cpp
+++ b/src/daily/daily.cpp
@@ -75,7 +75,7 @@ void advanceday(char &clearformess,char canseethings)
                if(squad[sq]->squad[p]->activity.type!=ACTIVITY_NONE&&
                   squad[sq]->squad[p]->activity.type!=ACTIVITY_VISIT)
                {
-                  if(clearformess) erase();
+                  if(clearformess) clear();
                   else makedelimiter();
                   set_color(COLOR_WHITE,COLOR_BLACK,1);
                   move(8,1);
@@ -101,7 +101,7 @@ void advanceday(char &clearformess,char canseethings)
          if(location[squad[sq]->activity.arg]->closed||
             location[squad[sq]->activity.arg]->siege.siege)
          {
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
             move(8,1);
@@ -139,7 +139,7 @@ void advanceday(char &clearformess,char canseethings)
                      long v=id_getcar(caridused[c2]);
                      if(v!=-1)
                      {
-                        if(clearformess) erase();
+                        if(clearformess) clear();
                         else makedelimiter();
                         set_color(COLOR_WHITE,COLOR_BLACK,1);
                         move(8,1);
@@ -258,7 +258,7 @@ void advanceday(char &clearformess,char canseethings)
          if(location[squad[sq]->activity.arg]->needcar&&squad[sq]->squad[0])
             if(squad[sq]->squad[0]->carid==-1)
             {
-               if(clearformess) erase();
+               if(clearformess) clear();
                else makedelimiter();
                set_color(COLOR_WHITE,COLOR_BLACK,1);
                move(8,1);
@@ -306,7 +306,7 @@ void advanceday(char &clearformess,char canseethings)
          bool canDepart=true;
          if(location[squad[sq]->activity.arg]->parent==travelLocation)
          {
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
             move(8,1);
             int price;
@@ -336,7 +336,7 @@ void advanceday(char &clearformess,char canseethings)
          case SITE_CITY_ATLANTA:
          case SITE_CITY_MIAMI:
          case SITE_CITY_WASHINGTON_DC:
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
             move(8,1);
             addstr(squad[sq]->name, gamelog);
@@ -360,7 +360,7 @@ void advanceday(char &clearformess,char canseethings)
          case SITE_BUSINESS_PAWNSHOP:
          case SITE_BUSINESS_CARDEALERSHIP:
          case SITE_BUSINESS_ARMSDEALER:
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
             move(8,1);
@@ -399,7 +399,7 @@ void advanceday(char &clearformess,char canseethings)
             break;
          case SITE_HOSPITAL_UNIVERSITY:
          case SITE_HOSPITAL_CLINIC:
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
             move(8,1);
@@ -418,7 +418,7 @@ void advanceday(char &clearformess,char canseethings)
             clearformess=1;
             break;
          default:
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
             move(8,1);
@@ -441,7 +441,7 @@ void advanceday(char &clearformess,char canseethings)
 
             getkey();
 
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
 
             int c='t';
@@ -546,7 +546,7 @@ void advanceday(char &clearformess,char canseethings)
             criminalize(*pool[p],LAWFLAG_CARTHEFT);
          break;
       case ACTIVITY_POLLS:
-         if(clearformess) erase();
+         if(clearformess) clear();
          else makedelimiter();
 
          set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -642,7 +642,7 @@ void advanceday(char &clearformess,char canseethings)
 
             if(pool[p]->alive&&pool[p]->blood<0)
             {
-               if(clearformess) erase();
+               if(clearformess) clear();
                else makedelimiter();
                move(8,1);
                pool[p]->die();
@@ -808,7 +808,7 @@ void advanceday(char &clearformess,char canseethings)
             //EVICTED!!!!!!!!!
             else
             {
-               if(clearformess) erase();
+               if(clearformess) clear();
                else makedelimiter();
 
                set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -974,7 +974,7 @@ void advanceday(char &clearformess,char canseethings)
                      pool[p]->get_attribute(ATTRIBUTE_HEALTH,true)<=1)
                   {
                      pool[p]->die();
-                     if(clearformess) erase();
+                     if(clearformess) clear();
                      else makedelimiter();
                      set_color(COLOR_WHITE,COLOR_BLACK,1);
                      move(8,1);
@@ -1025,7 +1025,7 @@ void advanceday(char &clearformess,char canseethings)
             {
                pool[p]->location=pool[p]->base;
 
-               if(clearformess) erase();
+               if(clearformess) clear();
                else makedelimiter();
 
                set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -1252,7 +1252,7 @@ void dispersalcheck(char &clearformess)
       {
          if(dispersal_status[p]==DISPERSAL_NOCONTACT||dispersal_status[p]==DISPERSAL_HIDING||dispersal_status[p]==DISPERSAL_ABANDONLCS)
          {
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
 
             if(!disbanding)
@@ -1370,7 +1370,7 @@ bool promotesubordinates(Creature &cr, char &clearformess)
 
       if(subordinates>0) // Disintegration of the LCS
       {
-         if(clearformess) erase();
+         if(clearformess) clear();
          else makedelimiter();
 
          set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -1410,7 +1410,7 @@ bool promotesubordinates(Creature &cr, char &clearformess)
       }
    }
 
-   if(clearformess) erase();
+   if(clearformess) clear();
    else makedelimiter();
 
    if(bigboss!=-1) // Normal promotion

diff --git a/src/daily/date.cpp b/src/daily/date.cpp
index af2eb0f..b2c7c0c 100644 (file)
--- a/src/daily/date.cpp
+++ b/src/daily/date.cpp
@@ -107,7 +107,7 @@ static int dateresult(int aroll,int troll,datest &d,int e,int p,int y)
          d.date[e]->flag|=CREATUREFLAG_LOVESLAVE;
          d.date[e]->hireid=pool[p]->id;
 
-         erase();
+         clear();
 
          set_color(COLOR_WHITE,COLOR_BLACK,1);
          move(0,0);
@@ -379,7 +379,7 @@ char completevacation(datest &d,int p,char &clearformess)
 
    clearformess=1;
 
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(0,0);
    addstr(pool[p]->name, gamelog);
@@ -449,7 +449,7 @@ char completedate(datest &d,int p,char &clearformess)
    int e;
    clearformess=1;
 
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(0,0);
    addstr(pool[p]->name, gamelog);
@@ -561,7 +561,7 @@ char completedate(datest &d,int p,char &clearformess)
 
    for(e=len(d.date)-1;e>=0;e--)
    {
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(0,0);
       addstr(d.date[e]->name, gamelog);
@@ -791,7 +791,7 @@ char completedate(datest &d,int p,char &clearformess)
                //Create interrogation data
                d.date[e]->activity.intr()=new interrogation;
 
-               erase();
+               clear();
 
                set_color(COLOR_WHITE,COLOR_BLACK,1);
                move(0,0);

diff --git a/src/daily/interrogation.cpp b/src/daily/interrogation.cpp
index a1f6b20..8e1994b 100644 (file)
--- a/src/daily/interrogation.cpp
+++ b/src/daily/interrogation.cpp
@@ -183,7 +183,7 @@ void tendhostage(Creature *cr,char &clearformess)
          {
             if(pool[p]==cr)
             {
-               if(clearformess) erase();
+               if(clearformess) clear();
                else makedelimiter();
 
                set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -217,7 +217,7 @@ void tendhostage(Creature *cr,char &clearformess)
 
    clearformess=1;
 
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(0,0);
    addstr(cr->name);
@@ -345,7 +345,7 @@ void tendhostage(Creature *cr,char &clearformess)
 
       if(techniques[TECHNIQUE_KILL]) // Kill the Hostage
       {
-         erase();
+         clear();
          set_color(COLOR_WHITE,COLOR_BLACK,1);
          move(0,0);
          addstr(cr->name, gamelog);
@@ -453,7 +453,7 @@ void tendhostage(Creature *cr,char &clearformess)
          }
       }
 
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(0,0);
       addstr(cr->name, gamelog);
@@ -1532,7 +1532,7 @@ void tendhostage(Creature *cr,char &clearformess)
       {
          getkey();
 
-         erase();
+         clear();
          set_color(COLOR_WHITE,COLOR_BLACK,1);
          move(y=1,0);
          gamelog.newline();

diff --git a/src/daily/recruit.cpp b/src/daily/recruit.cpp
index 3a2be2e..ad7d6ac 100644 (file)
--- a/src/daily/recruit.cpp
+++ b/src/daily/recruit.cpp
@@ -100,7 +100,7 @@ char recruitment_activity(Creature &cr,char &clearformess)
       music.play(MUSIC_RECRUITING);
       cr.train(SKILL_STREETSENSE,5);
 
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       mvaddstr(0,0,"リベラルスカウトの冒険");
       printcreatureinfo(&cr);
@@ -142,7 +142,7 @@ char recruitment_activity(Creature &cr,char &clearformess)
 
          getkey();
 
-         erase();
+         clear();
          set_color(COLOR_WHITE,COLOR_BLACK,1);
          mvaddstr(0,0,"リベラルスカウトの冒険");
          printcreatureinfo(&encounter[0]);
@@ -151,7 +151,7 @@ char recruitment_activity(Creature &cr,char &clearformess)
       } else {
          while(true)
          {
-            erase();
+            clear();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
             mvaddstr(0,0,"リベラルスカウトの冒険");
             printcreatureinfo(&cr);
@@ -176,7 +176,7 @@ char recruitment_activity(Creature &cr,char &clearformess)
             if(c >= 0 && c < ENCMAX-1 && encounter[c].exists)
             {
                int id=encounter[c].id;
-               erase();
+               clear();
                set_color(COLOR_WHITE,COLOR_BLACK,1);
                mvaddstr(0,0,"リベラルスカウトの冒険");
                printcreatureinfo(&encounter[c]);
@@ -200,7 +200,7 @@ char completerecruitmeeting(recruitst &r,int p,char &clearformess)
    music.play(MUSIC_RECRUITING);
    clearformess=1;
 
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(0,0);
    if(pool[p]->meetings++>5 && LCSrandom(pool[p]->meetings-5))
@@ -312,7 +312,7 @@ char completerecruitmeeting(recruitst &r,int p,char &clearformess)
 
          getkey();
 
-         erase();
+         clear();
          sleeperize_prompt(*r.recruit,*pool[p],6);
 
          r.recruit->hireid=pool[p]->id;

diff --git a/src/daily/shopsnstuff.cpp b/src/daily/shopsnstuff.cpp
index db08c5b..b502beb 100644 (file)
--- a/src/daily/shopsnstuff.cpp
+++ b/src/daily/shopsnstuff.cpp
@@ -38,7 +38,7 @@ void hospital(int loc)
 
    while(true)
    {
-      erase();
+      clear();
 
       locheader();
       printparty();
@@ -122,7 +122,7 @@ void dealership(int loc)
 
    while(true)
    {
-      erase();
+      clear();
 
       locheader();
       printparty();

diff --git a/src/daily/siege.cpp b/src/daily/siege.cpp
index ac44ba1..de871d9 100644 (file)
--- a/src/daily/siege.cpp
+++ b/src/daily/siege.cpp
@@ -225,7 +225,7 @@ void siegecheck(char canseethings)
             }
             if(policesleeperwarning)
             {
-               erase();
+               clear();
                set_color(COLOR_WHITE,COLOR_BLACK,1);
                move(8,1);
                addstr("あなたは警察署の潜伏者から", gamelog);
@@ -271,7 +271,7 @@ void siegecheck(char canseethings)
             if(numpres>0)
             {
                music.play(MUSIC_SIEGE);
-               erase();
+               clear();
                set_color(COLOR_WHITE,COLOR_BLACK,1);
 
                move(8,1);
@@ -321,7 +321,7 @@ void siegecheck(char canseethings)
             }
             else
             {
-               erase();
+               clear();
                set_color(COLOR_WHITE,COLOR_BLACK,1);
 
                move(8,1);
@@ -390,7 +390,7 @@ void siegecheck(char canseethings)
             }
             if(ceosleepercount||!LCSrandom(5))
             {
-               erase();
+               clear();
                set_color(COLOR_WHITE,COLOR_BLACK,1);
                move(8,1);
                addstr("", gamelog);
@@ -413,7 +413,7 @@ void siegecheck(char canseethings)
             music.play(MUSIC_SIEGE);
             location[l]->siege.timeuntilcorps=-1;
             // Corps raid!
-            erase();
+            clear();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
 
             move(8,1);
@@ -455,7 +455,7 @@ void siegecheck(char canseethings)
                }
                if(ccssleepercount>0)
                {
-                  erase();
+                  clear();
                   set_color(COLOR_WHITE,COLOR_BLACK,1);
                   move(8,1);
                   addstr("あなたは潜伏者からCCSによる", gamelog);
@@ -473,7 +473,7 @@ void siegecheck(char canseethings)
                music.play(MUSIC_SIEGE);
                location[l]->siege.timeuntilccs=-1;
                // CCS raid!
-               erase();
+               clear();
                set_color(COLOR_WHITE,COLOR_BLACK,1);
 
                move(8,1);
@@ -488,7 +488,7 @@ void siegecheck(char canseethings)
                   !LCSrandom(5))
                {
                   // CCS Carbombs safehouse!!
-                  erase();
+                  clear();
                   set_color(COLOR_RED,COLOR_BLACK,1);
 
                   move(8,1);
@@ -497,7 +497,7 @@ void siegecheck(char canseethings)
 
                   getkey();
 
-                  erase();
+                  clear();
                   set_color(COLOR_WHITE,COLOR_BLACK,1);
 
                   move(0,1);
@@ -561,7 +561,7 @@ void siegecheck(char canseethings)
                else
                {
                   // CCS Raids safehouse
-                  erase();
+                  clear();
                   set_color(COLOR_RED,COLOR_BLACK,1);
 
                   move(8,1);
@@ -601,7 +601,7 @@ void siegecheck(char canseethings)
             }
             if(agentsleepercount)
             {
-               erase();
+               clear();
                set_color(COLOR_WHITE,COLOR_BLACK,1);
                move(8,1);
                addstr("潜伏者の諜報員によると、CIAは", gamelog);
@@ -619,7 +619,7 @@ void siegecheck(char canseethings)
             music.play(MUSIC_SIEGE);
             location[l]->siege.timeuntilcia=-1;
             // CIA raids!
-            erase();
+            clear();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
 
             move(8,1);
@@ -665,7 +665,7 @@ void siegecheck(char canseethings)
          if(!location[l]->siege.siege&&offended_amradio&&attitude[VIEW_AMRADIO]<=35&&!LCSrandom(600)&&numpres>0)
          {
             music.play(MUSIC_SIEGE);
-            erase();
+            clear();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
 
             move(8,1);
@@ -687,7 +687,7 @@ void siegecheck(char canseethings)
          if(!location[l]->siege.siege&&offended_cablenews&&attitude[VIEW_CABLENEWS]<=35&&!LCSrandom(600)&&numpres>0)
          {
             music.play(MUSIC_SIEGE);
-            erase();
+            clear();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
 
             move(8,1);
@@ -722,7 +722,7 @@ void siegecheck(char canseethings)
                   firemensleepercount++;
             if(LCSrandom(firemensleepercount+1)>0||!LCSrandom(10))
             {
-               erase();
+               clear();
                set_color(COLOR_WHITE,COLOR_BLACK,1);
                move(8,1);
                if(firemensleepercount) addstr("潜伏者の焚書官によると、", gamelog);
@@ -742,7 +742,7 @@ void siegecheck(char canseethings)
             music.play(MUSIC_SIEGE);
             location[l]->siege.timeuntilfiremen=-1;
             // Firemen raid!
-            erase();
+            clear();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
 
             move(8,1);
@@ -757,7 +757,7 @@ void siegecheck(char canseethings)
 
             getkey();
 
-            erase();
+            clear();
 
             set_color(COLOR_WHITE,COLOR_BLACK,1);
             move(1,1);
@@ -788,7 +788,7 @@ void siegecheck(char canseethings)
          else if(law[LAW_FREESPEECH]==-2 && location[l]->siege.timeuntilfiremen==0)
          {
             location[l]->siege.timeuntilfiremen=-1;
-            erase();
+            clear();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
 
             move(8,1);
@@ -885,7 +885,7 @@ void siegeturn(char clearformess)
          //resolve sieges with no people
          if(liberalcount[l]==0)
          {
-            erase();
+            clear();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
 
             move(8,1);
@@ -950,7 +950,7 @@ void siegeturn(char clearformess)
             if(location[l]->compound_stores==0&&eaters>0)
             {
                starving=true;
-               if(clearformess) erase();
+               if(clearformess) clear();
                else makedelimiter();
                set_color(COLOR_WHITE,COLOR_BLACK,1);
                move(8,1);
@@ -976,7 +976,7 @@ void siegeturn(char clearformess)
                {
                   pool[p]->die();
 
-                  if(clearformess) erase();
+                  if(clearformess) clear();
                   else makedelimiter();
                   set_color(COLOR_WHITE,COLOR_BLACK,1);
                   move(8,1);
@@ -992,7 +992,7 @@ void siegeturn(char clearformess)
 
             if(attack)
             {
-               if(clearformess) erase();
+               if(clearformess) clear();
                else makedelimiter();
                set_color(COLOR_WHITE,COLOR_BLACK,1);
                move(8,1);
@@ -1013,7 +1013,7 @@ void siegeturn(char clearformess)
                {
                   no_bad=0;
 
-                  if(clearformess) erase();
+                  if(clearformess) clear();
                   else makedelimiter();
                   set_color(COLOR_WHITE,COLOR_BLACK,1);
                   move(8,1);
@@ -1035,7 +1035,7 @@ void siegeturn(char clearformess)
 
                   if(len(pol))
                   {
-                     if(clearformess) erase();
+                     if(clearformess) clear();
                      else makedelimiter();
                      set_color(COLOR_WHITE,COLOR_BLACK,1);
                      move(8,1);
@@ -1072,7 +1072,7 @@ void siegeturn(char clearformess)
                   //AIR STRIKE!
                   bool hit=true;
 
-                  if(clearformess) erase();
+                  if(clearformess) clear();
                   else makedelimiter();
                   set_color(COLOR_WHITE,COLOR_BLACK,1);
                   move(8,1);
@@ -1086,7 +1086,7 @@ void siegeturn(char clearformess)
 
                   if(hasAAGun)
                   {
-                     if(clearformess) erase();
+                     if(clearformess) clear();
                      else makedelimiter();
                      move(8,1);
                      addstr("雷のような対空砲の音がアジトに響き渡った!", gamelog);
@@ -1094,7 +1094,7 @@ void siegeturn(char clearformess)
 
                      getkey();
 
-                     if(clearformess) erase();
+                     if(clearformess) clear();
                      else makedelimiter();
                      move(8,1);
                      if(LCSrandom(5))
@@ -1108,7 +1108,7 @@ void siegeturn(char clearformess)
 
                            getkey();
 
-                           if(clearformess) erase();
+                           if(clearformess) clear();
                            else makedelimiter();
                            move(8,1);
                            addstr("一部始終がテレビ中継されている。リベラル・クライム・スコードのメンバー全員が20ジュースを得た!", gamelog);
@@ -1129,7 +1129,7 @@ void siegeturn(char clearformess)
 
                   if(hit)
                   {
-                     if(clearformess) erase();
+                     if(clearformess) clear();
                      else makedelimiter();
                      move(8,1);
                      addstr("爆発がアジトを揺さぶる!", gamelog);
@@ -1139,7 +1139,7 @@ void siegeturn(char clearformess)
 
                      if(hasAAGun && !LCSrandom(3))
                      {
-                        if(clearformess) erase();
+                        if(clearformess) clear();
                         else makedelimiter();
                         move(8,1);
                         addstr("対空砲に直撃した!", gamelog);
@@ -1147,7 +1147,7 @@ void siegeturn(char clearformess)
 
                         getkey();
 
-                        if(clearformess) erase();
+                        if(clearformess) clear();
                         else makedelimiter();
                         move(8,1);
                         addstr("残されたものは破片だけだった…", gamelog);
@@ -1159,7 +1159,7 @@ void siegeturn(char clearformess)
                      }
                      else if(hasGenerator && !LCSrandom(3))
                      {
-                        if(clearformess) erase();
+                        if(clearformess) clear();
                         else makedelimiter();
                         move(8,1);
                         addstr("発電機が破壊された!", gamelog);
@@ -1167,7 +1167,7 @@ void siegeturn(char clearformess)
 
                         getkey();
 
-                        if(clearformess) erase();
+                        if(clearformess) clear();
                         else makedelimiter();
                         move(8,1);
                         addstr("明かりが消え真っ暗になった。", gamelog);
@@ -1185,7 +1185,7 @@ void siegeturn(char clearformess)
 
                         if(len(pol))
                         {
-                           if(clearformess) erase();
+                           if(clearformess) clear();
                            else makedelimiter();
                            set_color(COLOR_WHITE,COLOR_BLACK,1);
                            move(8,1);
@@ -1214,7 +1214,7 @@ void siegeturn(char clearformess)
                      }
                      else
                      {
-                        if(clearformess) erase();
+                        if(clearformess) clear();
                         else makedelimiter();
                         move(8,1);
                         addstr("幸いなことに死傷者はいなかった。", gamelog);
@@ -1231,7 +1231,7 @@ void siegeturn(char clearformess)
                   no_bad=0;
 
                   //ENGINEERS
-                  if(clearformess) erase();
+                  if(clearformess) clear();
                   else makedelimiter();
                   set_color(COLOR_WHITE,COLOR_BLACK,1);
                   move(8,1);
@@ -1264,7 +1264,7 @@ void siegeturn(char clearformess)
 
                   set_color(COLOR_WHITE,COLOR_BLACK,0);
 
-                  erase();
+                  clear();
                   move(1,1);
                   switch(LCSrandom(5))
                   {
@@ -1466,7 +1466,7 @@ void giveup()
       int polsta=find_police_station(loc);
 
       //END SIEGE
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(1,1);
       if(location[loc]->siege.siegetype==SIEGE_POLICE && location[loc]->siege.escalationstate == 0)
@@ -1658,7 +1658,7 @@ void giveup()
       if(location[loc]->siege.siegetype==SIEGE_CCS&&location[loc]->type==SITE_INDUSTRY_WAREHOUSE)
          location[loc]->renting=RENTING_CCS; // CCS Captures warehouse
 
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(1,1);
       addstr(location[loc]->getname(), gamelog);
@@ -1770,7 +1770,7 @@ char sally_forth_aux(int loc)
 
       // Let's roll
       autopromote(loc);
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       move(0,0);
@@ -1927,7 +1927,7 @@ char sally_forth_aux(int loc)
 void sally_forth()
 {  //GIVE INFO SCREEN
    music.play(MUSIC_DEFENSE);
-   erase();
+   clear();
    set_color(COLOR_RED,COLOR_BLACK,1);
    move(1,30);
    addstr("包囲網: 脱出か死か");
@@ -2031,7 +2031,7 @@ void escape_engage()
 {
    music.play(MUSIC_DEFENSE);
    //GIVE INFO SCREEN
-   erase();
+   clear();
    set_color(COLOR_RED,COLOR_BLACK,1);
    move(1,30);
    addstr("防衛戦: 脱出か死か");
@@ -2155,7 +2155,7 @@ void escapesiege(char won)
    {
       music.play(MUSIC_CONQUER);
       //GIVE INFO SCREEN
-      erase();
+      clear();
       set_color(COLOR_YELLOW,COLOR_BLACK,1);
       move(1,37);
       addstr("脱出!", gamelog);
@@ -2251,7 +2251,7 @@ void conquertext()
 {
    //GIVE INFO SCREEN
    music.play(MUSIC_CONQUER);
-   erase();
+   clear();
    set_color(COLOR_GREEN,COLOR_BLACK,1);
    move(1,26);
    addstr("* * * * *   勝利   * * * * *", gamelog);
@@ -2292,7 +2292,7 @@ void conquertextccs()
 {
    music.play(MUSIC_CONQUER);
    //GIVE INFO SCREEN
-   erase();
+   clear();
    set_color(COLOR_GREEN,COLOR_BLACK,1);
    move(1,26);
    addstr("* * * * *   勝利   * * * * *", gamelog);
@@ -2392,7 +2392,7 @@ void statebrokenlaws(int loc)
    }
    for(int i=0;i<LAWFLAGNUM;i++) if(breakercount[i]) typenum++;
 
-   erase();
+   clear();
 
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(1,1);

diff --git a/src/includes.h b/src/includes.h
index 06a5b69..b4e98fa 100644 (file)
--- a/src/includes.h
+++ b/src/includes.h
@@ -1005,14 +1005,13 @@ inline int mvaddgrah(int y,int x,char ch) { return mvaddch(y,x,translateGraphics
 inline int addchar(char ch,Log &log) { log.record(ch); return addchar(ch); }
 inline int mvaddchar(int y,int x,char ch,Log &log) { log.record(ch); return mvaddchar(y,x,ch); }
 /* Redefining addstr() and mvaddstr() so they use addchar() and mvaddchar(), fixing display of extended characters */
+#if defined(CH_USE_MULTIBYTE)
+#else
 #undef addstr
-#if !defined(CH_USE_MULTIBYTE)
 inline int addstr(const char* text) { int ret=ERR; for(int i=0;i<len(text);i++) ret=addchar(text[i]); return ret; }
 #endif
-#if !defined(CH_USE_MULTIBYTE)
 #undef mvaddstr
 inline int mvaddstr(int y,int x,const char* text) { int ret=move(y,x); if(ret!=ERR) ret=addstr(text); return ret; }
-#endif
 /* Various wrappers to addstr() and mvaddstr() which handle permutations of:
    - Including or not including the gamelog for external message logging
    - std::string or c-style char arrays */
@@ -1260,6 +1259,8 @@ void conservatise(Creature &cr);
 void liberalize(Creature &cr,bool rename=true);
 /* gives a cover name to CCS members */
 void nameCCSMember(Creature &cr);
+/* convert to half width katakana */
+char *to_half(char *str);
 
 /*
  misc.cpp

diff --git a/src/locations/locations.cpp b/src/locations/locations.cpp
index c4d0eb7..d4f0298 100644 (file)
--- a/src/locations/locations.cpp
+++ b/src/locations/locations.cpp
@@ -604,7 +604,6 @@ void initlocation(Location &loc)
          case 3:strcat(loc.name,"ヘルシー");break;
          case 4:strcat(loc.name,"ニュー ユー");break;
       }
-      strcat(loc.name,"・");
       switch(LCSrandom(5))
       {
          case 0:strcat(loc.name,"ダイエット");break;
@@ -648,7 +647,6 @@ void initlocation(Location &loc)
          case 3:strcat(loc.name,"マイクロ");break;
          case 4:strcat(loc.name,"テクノ");break;
       }
-      strcat(loc.name,"・");
       switch(LCSrandom(5))
       {
          case 0:strcat(loc.name,"パンダ");break;
@@ -677,7 +675,6 @@ void initlocation(Location &loc)
          case 3:strcat(loc.name,"モーニング");break;
          case 4:strcat(loc.name,"イブニング");break;
       }
-      strcat(loc.name,"・");
       switch(LCSrandom(5))
       {
          case 0:strcat(loc.name,"マグ");break;

diff --git a/src/monthly/endgame.cpp b/src/monthly/endgame.cpp
index 3668d91..30377ac 100644 (file)
--- a/src/monthly/endgame.cpp
+++ b/src/monthly/endgame.cpp
@@ -39,7 +39,7 @@ void tossjustices(char canseethings)
    if(canseethings)
    {
       music.play(MUSIC_ELECTIONS);
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
 
@@ -117,7 +117,7 @@ void amendment_termlimits(char canseethings)
    if(canseethings)
    {
       music.play(MUSIC_ELECTIONS);
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
 
@@ -179,7 +179,7 @@ void reaganify(char canseethings)
       music.play(MUSIC_ELECTIONS);
       set_color(COLOR_WHITE,COLOR_BLACK,1);
 
-      erase();
+      clear();
       move(12,3);
       addstr("保守強硬派議会による保守強硬発議!");
 
@@ -249,21 +249,21 @@ void reaganify(char canseethings)
                //DATING AND REAGANIFIED
                set_color(COLOR_WHITE,COLOR_BLACK,1);
 
-               erase();
+               clear();
                move(12,15);
                addstr("この国の崩壊が迫る中、あなたは休暇を過ごしていた。");
 
                getkey();
 
                set_color(COLOR_WHITE,COLOR_BLACK,0);
-               erase();
+               clear();
                move(12,13);
                addstr("保守派はこの世界を自分たちの思い通りに変えてしまった。");
 
                getkey();
 
                set_color(COLOR_BLACK,COLOR_BLACK,1);
-               erase();
+               clear();
                move(12,8);
                addstr("あなたはいずれ捕らえられるだろう。もはやどうすることもできない。");
 
@@ -275,21 +275,21 @@ void reaganify(char canseethings)
                //HIDING AND REAGANIFIED
                set_color(COLOR_WHITE,COLOR_BLACK,1);
 
-               erase();
+               clear();
                move(12,15);
                addstr("この国の崩壊が迫る中、あなたは行方を眩ませていた。");
 
                getkey();
 
                set_color(COLOR_WHITE,COLOR_BLACK,0);
-               erase();
+               clear();
                move(12,13);
                addstr("保守派はこの世界を自分たちの思い通りに変えてしまった。");
 
                getkey();
 
                set_color(COLOR_BLACK,COLOR_BLACK,1);
-               erase();
+               clear();
                move(12,8);
                addstr("あなたはいずれ捕らえられるだろう。もはやどうすることもできない。");
 
@@ -301,21 +301,21 @@ void reaganify(char canseethings)
                //IF YOU ARE ALL IN PRISON, JUST PASS AWAY QUIETLY
                set_color(COLOR_WHITE,COLOR_BLACK,1);
 
-               erase();
+               clear();
                move(12,22);
                addstr("投獄されている間にこの国は後退した。");
 
                getkey();
 
                set_color(COLOR_WHITE,COLOR_BLACK,0);
-               erase();
+               clear();
                move(12,19);
                addstr("あなたの良心が解放されることはないだろう。");
 
                getkey();
 
                set_color(COLOR_BLACK,COLOR_BLACK,1);
-               erase();
+               clear();
                move(12,32);
                addstr("光は消え去った…");
 
@@ -327,21 +327,21 @@ void reaganify(char canseethings)
                //DISBANDED AND REAGANIFIED
                set_color(COLOR_WHITE,COLOR_BLACK,1);
 
-               erase();
+               clear();
                move(12,16);
                addstr("姿を消し平穏な日々を送っていた。だがもう限界だ。");
 
                getkey();
 
                set_color(COLOR_WHITE,COLOR_BLACK,0);
-               erase();
+               clear();
                move(12,13);
                addstr("保守派はこの世界を自分たちの思い通りに変えてしまった。");
 
                getkey();
 
                set_color(COLOR_BLACK,COLOR_BLACK,1);
-               erase();
+               clear();
                move(12,8);
                addstr("あなたはいずれ捕らえられるだろう。もはやどうすることもできない。");
 
@@ -377,7 +377,7 @@ void stalinize(char canseethings)
       music.play(MUSIC_ELECTIONS);
       set_color(COLOR_WHITE,COLOR_BLACK,1);
 
-      erase();
+      clear();
       move(12,11);
       addstr("スターリン主義議会によるスターリン主義発議!");
 
@@ -450,21 +450,21 @@ void stalinize(char canseethings)
                //DATING AND STALINIZED
                set_color(COLOR_WHITE,COLOR_BLACK,1);
 
-               erase();
+               clear();
                move(12,15);
                addstr("この国の崩壊が迫る中、あなたは休暇を過ごしていた。");
 
                getkey();
 
                set_color(COLOR_WHITE,COLOR_BLACK,0);
-               erase();
+               clear();
                move(12,8);
                addstr("スターリン主義者はこの世界を自分たちの思い通りに変えてしまった。");
 
                getkey();
 
                set_color(COLOR_BLACK,COLOR_BLACK,1);
-               erase();
+               clear();
                move(12,8);
                addstr("あなたはいずれ捕らえられるだろう。もはやどうすることもできない。");
 
@@ -476,21 +476,21 @@ void stalinize(char canseethings)
                //HIDING AND STALINIZED
                set_color(COLOR_WHITE,COLOR_BLACK,1);
 
-               erase();
+               clear();
                move(12,15);
                addstr("この国の崩壊が迫る中、あなたは行方を眩ませていた。");
 
                getkey();
 
                set_color(COLOR_WHITE,COLOR_BLACK,0);
-               erase();
+               clear();
                move(12,8);
                addstr("スターリン主義者はこの世界を自分たちの思い通りに変えてしまった。");
 
                getkey();
 
                set_color(COLOR_BLACK,COLOR_BLACK,1);
-               erase();
+               clear();
                move(12,8);
                addstr("あなたはいずれ捕らえられるだろう。もはやどうすることもできない。");
 
@@ -502,21 +502,21 @@ void stalinize(char canseethings)
                //IF YOU ARE ALL IN PRISON, YOU END UP IN A GULAG, COMRADE
                set_color(COLOR_WHITE,COLOR_BLACK,1);
 
-               erase();
+               clear();
                move(12,22);
                addstr("投獄されている間にこの国は後退した。");
 
                getkey();
 
                set_color(COLOR_WHITE,COLOR_BLACK,0);
-               erase();
+               clear();
                move(12,13);
                addstr("あなたは新たに併合されたカナダの強制収容所に送られる。");
 
                getkey();
 
                set_color(COLOR_BLACK,COLOR_BLACK,1);
-               erase();
+               clear();
                move(12,26);
                addstr("光の届かないツンドラの地に…");
 
@@ -528,21 +528,21 @@ void stalinize(char canseethings)
                //DISBANDED AND STALINIZED
                set_color(COLOR_WHITE,COLOR_BLACK,1);
 
-               erase();
+               clear();
                move(12,16);
                addstr("姿を消し平穏な日々を送っていた。だがもう限界だ。");
 
                getkey();
 
                set_color(COLOR_WHITE,COLOR_BLACK,0);
-               erase();
+               clear();
                move(12,8);
                addstr("スターリン主義者はこの世界を自分たちの思い通りに変えてしまった。");
 
                getkey();
 
                set_color(COLOR_BLACK,COLOR_BLACK,1);
-               erase();
+               clear();
                move(12,8);
                addstr("あなたはいずれ捕らえられるだろう。もはやどうすることもできない。");
 
@@ -575,7 +575,7 @@ char ratify(int level,int lawview,int view,char congress,char canseethings)
    if(canseethings)
    {
       music.play(MUSIC_ELECTIONS);
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
 
@@ -825,7 +825,7 @@ char ratify(int level,int lawview,int view,char congress,char canseethings)
 /* endgame - header for announcing constitutional amendments */
 void amendmentheading()
 {
-   erase();
+   clear();
 
    set_color(COLOR_WHITE,COLOR_BLACK,1);
 

diff --git a/src/monthly/justice.cpp b/src/monthly/justice.cpp
index d02c5bb..2d4cf4f 100644 (file)
--- a/src/monthly/justice.cpp
+++ b/src/monthly/justice.cpp
@@ -38,7 +38,7 @@ void trial(Creature &g)
    g.location=g.base;
    bool breaker[LAWFLAGNUM]={0};
 
-   erase();
+   clear();
 
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(1,1);
@@ -542,7 +542,7 @@ void trial(Creature &g)
    if(defense!=2)
    {
       int prosecution=0;
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(1,1);
@@ -777,7 +777,7 @@ void trial(Creature &g)
       getkey();
 
       //JURY RETURN MESSAGE
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       move(1,1);
       addstr("陪審員は協議から戻ってきた。", gamelog);
@@ -923,7 +923,7 @@ void trial(Creature &g)
    // I would imagine this would disregard the strength of the defense. -- LK
    else
    {
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       move(1,1);
       addstr("裁判所はそれを受け入れた。", gamelog);
@@ -1283,7 +1283,7 @@ char prison(Creature &g)
       //COMMUTE DEATH IN RIGHT CLIMATE
       if(g.deathpenalty&&law[LAW_DEATHPENALTY]==2)
       {
-         erase();
+         clear();
          set_color(COLOR_WHITE,COLOR_BLACK,0);
          move(8,1);
          addstr(g.name, gamelog);
@@ -1306,7 +1306,7 @@ char prison(Creature &g)
          //EXECUTE
          if(g.deathpenalty)
          {
-            erase();
+            clear();
             set_color(COLOR_RED,COLOR_BLACK,1);
             move(8,1);
             addstr("恥辱:", gamelog);
@@ -1352,7 +1352,7 @@ char prison(Creature &g)
          //SET FREE
          else
          {
-            erase();
+            clear();
             set_color(COLOR_WHITE,COLOR_BLACK,0);
             move(8,1);
             addstr(g.name, gamelog);
@@ -1378,7 +1378,7 @@ char prison(Creature &g)
       {
          if(g.deathpenalty)
          {
-            erase();
+            clear();
             set_color(COLOR_YELLOW,COLOR_BLACK,1);
             move(8,1);
             addstr(g.name, gamelog);
@@ -1391,7 +1391,7 @@ char prison(Creature &g)
          }
          else
          {
-            erase();
+            clear();
             set_color(COLOR_WHITE,COLOR_BLACK,1);
             move(8,1);
             addstr(g.name, gamelog);
@@ -1407,7 +1407,7 @@ char prison(Creature &g)
       {
          if(g.deathpenalty)
          {
-            erase();
+            clear();
             set_color(COLOR_YELLOW,COLOR_BLACK,1);
             move(8,1);
             addstr(g.name, gamelog);
@@ -1440,7 +1440,7 @@ void reeducation(Creature &g)
       "は刑務所内で政治犯罪被害者に関するビデオを見た。"
    };
 
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(8,1);
    addstr(g.name, gamelog);
@@ -1498,7 +1498,7 @@ void reeducation(Creature &g)
 
    getkey();
 
-   erase();
+   clear();
 
    return;
 }
@@ -1543,7 +1543,7 @@ void laborcamp(Creature &g)
 
    if(!escaped)experience=pickrandom(labor_camp_experiences);
 
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(8,1);
    addstr(g.name, gamelog);
@@ -1613,7 +1613,7 @@ void laborcamp(Creature &g)
 
    getkey();
 
-   erase();
+   clear();
 
    return;
 }
@@ -1695,7 +1695,7 @@ void prisonscene(Creature &g)
       }
    }
 
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(8,1);
    addstr(g.name, gamelog);
@@ -1759,7 +1759,7 @@ void prisonscene(Creature &g)
 
    getkey();
 
-   erase();
+   clear();
 
    return;
 }

diff --git a/src/monthly/lcsmonthly.cpp b/src/monthly/lcsmonthly.cpp
index bc1b7da..4e0ded3 100644 (file)
--- a/src/monthly/lcsmonthly.cpp
+++ b/src/monthly/lcsmonthly.cpp
@@ -34,7 +34,7 @@ This file is part of Liberal Crime Squad.
 void guardianupdate(char size, int power)
 {
    music.play(MUSIC_NEWSPAPER);
-   erase();
+   clear();
 
    set_color(COLOR_WHITE,COLOR_BLACK,0);
    move(5,2);
@@ -161,7 +161,7 @@ int choosespecialedition(char &clearformess)
    while(true)
    {
       music.play(MUSIC_NEWSPAPER);
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       move(0,0);
@@ -266,7 +266,7 @@ void printnews(short li,short newspaper)
 {
    music.play(MUSIC_NEWSPAPER);
    if(law[LAW_FREESPEECH]==-2)offended_firemen=1;
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
 
    if(loottype[li]->get_idname()=="LOOT_CEOPHOTOS") // Tmp -XML
@@ -713,7 +713,7 @@ void fundreport(char &clearformess)
 
    while(true)
    {
-      erase();
+      clear();
 
       int y=2,totalmoney=0,dailymoney=0,numpages=1;
 

diff --git a/src/monthly/monthly.cpp b/src/monthly/monthly.cpp
index ffd3688..0375c0f 100644 (file)
--- a/src/monthly/monthly.cpp
+++ b/src/monthly/monthly.cpp
@@ -278,7 +278,7 @@ void passmonth(char &clearformess,char canseethings)
    if(canseethings)
    {
       music.play(MUSIC_ELECTIONS);
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       mvaddstr(0,23,"LCS MONTHLY INTELLIGENCE REPORT");
       mvaddstr(2,27,"CURRENT POLITICAL TRENDS");
@@ -355,7 +355,7 @@ void passmonth(char &clearformess,char canseethings)
       music.play(MUSIC_DEFEAT);
       set_color(COLOR_WHITE,COLOR_BLACK,1);
 
-      erase();
+      clear();
       move(10,10);
       addstr("もはやリベラル・クライム・スコードは記憶の中にしか存在しない。", gamelog);
       gamelog.newline();
@@ -363,7 +363,7 @@ void passmonth(char &clearformess,char canseethings)
       getkey();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
-      erase();
+      clear();
       move(16,12);
       addstr("LCSメンバーだった者たちも全員捕らえられた。", gamelog);
       gamelog.newline();
@@ -371,7 +371,7 @@ void passmonth(char &clearformess,char canseethings)
       getkey();
 
       set_color(COLOR_BLACK,COLOR_BLACK,1);
-      erase();
+      clear();
       move(20,14);
       addstr("夢の実現を見ることは決してないだろう…", gamelog);
       gamelog.newline();
@@ -399,7 +399,7 @@ void passmonth(char &clearformess,char canseethings)
 
       if(location[pool[p]->location]->type==SITE_GOVERNMENT_POLICESTATION)
       {
-         if(clearformess) erase();
+         if(clearformess) clear();
          else makedelimiter();
 
          if(pool[p]->flag & CREATUREFLAG_MISSING)
@@ -529,7 +529,7 @@ void passmonth(char &clearformess,char canseethings)
    //FUND REPORTS
    if(canseethings)fundreport(clearformess);
    ledger.resetMonthlyAmounts();
-   if(clearformess) erase();
+   if(clearformess) clear();
 
    //HEAL CLINIC PEOPLE
    for(p=0;p<len(pool);p++)
@@ -612,7 +612,7 @@ void passmonth(char &clearformess,char canseethings)
          if(pool[p]->clinic==0)
          {
             pool[p]->blood=100;
-            if(clearformess) erase();
+            if(clearformess) clear();
             else makedelimiter();
 
             set_color(COLOR_WHITE,COLOR_BLACK,1);

diff --git a/src/monthly/sleeper_update.cpp b/src/monthly/sleeper_update.cpp
index abc287f..eaf5501 100644 (file)
--- a/src/monthly/sleeper_update.cpp
+++ b/src/monthly/sleeper_update.cpp
@@ -333,7 +333,7 @@ void sleeper_spy(Creature &cr,char &clearformess,char canseethings,int (&libpowe
       cr.juice-=1;
       if(cr.juice<-2)
       {
-         erase();
+         clear();
          move(6,1);
          addstr("潜伏者の", gamelog);
          addstr(cr.name, gamelog);
@@ -378,7 +378,7 @@ void sleeper_spy(Creature &cr,char &clearformess,char canseethings,int (&libpowe
          Item *it=new Loot(*loottype[getloottype("LOOT_SECRETDOCUMENTS")]);
          location[homes]->loot.push_back(it);
 
-         erase();
+         clear();
          move(6,1);
          addstr("潜伏者の", gamelog);
          addstr(cr.name, gamelog);
@@ -401,7 +401,7 @@ void sleeper_spy(Creature &cr,char &clearformess,char canseethings,int (&libpowe
          Item *it=new Loot(*loottype[getloottype("LOOT_POLICERECORDS")]);
          location[homes]->loot.push_back(it);
 
-         erase();
+         clear();
          move(6,1);
          addstr("潜伏者の", gamelog);
          addstr(cr.name, gamelog);
@@ -422,7 +422,7 @@ void sleeper_spy(Creature &cr,char &clearformess,char canseethings,int (&libpowe
          Item *it=new Loot(*loottype[getloottype("LOOT_CORPFILES")]);
          location[homes]->loot.push_back(it);
 
-         erase();
+         clear();
          move(6,1);
          addstr("潜伏者の", gamelog);
          addstr(cr.name, gamelog);
@@ -442,7 +442,7 @@ void sleeper_spy(Creature &cr,char &clearformess,char canseethings,int (&libpowe
          Item *it=new Loot(*loottype[getloottype("LOOT_PRISONFILES")]);
          location[homes]->loot.push_back(it);
 
-         erase();
+         clear();
          move(6,1);
          addstr("潜伏者の", gamelog);
          addstr(cr.name, gamelog);
@@ -464,7 +464,7 @@ void sleeper_spy(Creature &cr,char &clearformess,char canseethings,int (&libpowe
          Item *it=new Loot(*loottype[getloottype("LOOT_CABLENEWSFILES")]);
          location[homes]->loot.push_back(it);
 
-         erase();
+         clear();
          move(6,1);
          addstr("潜伏者の", gamelog);
          addstr(cr.name, gamelog);
@@ -486,7 +486,7 @@ void sleeper_spy(Creature &cr,char &clearformess,char canseethings,int (&libpowe
          Item *it=new Loot(*loottype[getloottype("LOOT_AMRADIOFILES")]);
          location[homes]->loot.push_back(it);
 
-         erase();
+         clear();
          move(6,1);
          addstr("潜伏者の", gamelog);
          addstr(cr.name, gamelog);
@@ -506,7 +506,7 @@ void sleeper_spy(Creature &cr,char &clearformess,char canseethings,int (&libpowe
          Item *it=new Loot(*loottype[getloottype("LOOT_RESEARCHFILES")]);
          location[homes]->loot.push_back(it);
 
-         erase();
+         clear();
          move(6,1);
          addstr("潜伏者の", gamelog);
          addstr(cr.name, gamelog);
@@ -525,7 +525,7 @@ void sleeper_spy(Creature &cr,char &clearformess,char canseethings,int (&libpowe
          Item *it=new Loot(*loottype[getloottype("LOOT_JUDGEFILES")]);
          location[homes]->loot.push_back(it);
 
-         erase();
+         clear();
          move(6,1);
          addstr("潜伏者の", gamelog);
          addstr(cr.name, gamelog);
@@ -544,7 +544,7 @@ void sleeper_spy(Creature &cr,char &clearformess,char canseethings,int (&libpowe
          Item *it=new Loot(*loottype[getloottype("LOOT_CCS_BACKERLIST")]);
          location[homes]->loot.push_back(it);
 
-         erase();
+         clear();
          move(6,1);
          addstr("潜伏者の", gamelog);
          addstr(cr.name, gamelog);
@@ -573,7 +573,7 @@ void sleeper_embezzle(Creature &cr,char &clearformess,char canseethings,int (&li
       cr.juice-=1;
       if(cr.juice<-2)
       {
-         erase();
+         clear();
          move(6,1);
          addstr("潜伏中の", gamelog);
          addstr(cr.name, gamelog);
@@ -630,7 +630,7 @@ void sleeper_steal(Creature &cr,char &clearformess,char canseethings,int (&libpo
       cr.juice-=1;
       if(cr.juice<-2)
       {
-         erase();
+         clear();
          move(6,1);
          addstr("潜伏中の", gamelog);
          addstr(cr.name, gamelog);
@@ -881,7 +881,7 @@ void sleeper_steal(Creature &cr,char &clearformess,char canseethings,int (&libpo
          break;
       }
    }
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,0);   move(6,1);
    addstr("潜伏者の", gamelog);
    addstr(cr.name, gamelog);
@@ -947,7 +947,7 @@ void sleeper_recruit(Creature &cr,char &clearformess,char canseethings,int (&lib
             location[recruit->worklocation]->hidden=0;
             pool.push_back(recruit);
 
-            erase();
+            clear();
             move(6,1);
             addstr("潜伏者の", gamelog);
             addstr(cr.name, gamelog);

diff --git a/src/politics/politics.cpp b/src/politics/politics.cpp
index 3bd9192..1be0094 100644 (file)
--- a/src/politics/politics.cpp
+++ b/src/politics/politics.cpp
@@ -138,7 +138,7 @@ void elections(char clearformess,char canseethings)
    if(canseethings)
    {
       music.play(MUSIC_ELECTIONS);
-      if(clearformess) erase();
+      if(clearformess) clear();
       else makedelimiter();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(8,1);
@@ -152,7 +152,7 @@ void elections(char clearformess,char canseethings)
    {
       if(canseethings)
       {
-         erase();
+         clear();
 
          set_color(COLOR_WHITE,COLOR_BLACK,1);
 
@@ -367,7 +367,7 @@ void elections(char clearformess,char canseethings)
    //PROPOSITIONS
    if(canseethings)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
 
@@ -629,7 +629,7 @@ void elections_senate(int senmod,char canseethings)
    if(canseethings)
    {
       music.play(MUSIC_ELECTIONS);
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
 
@@ -795,7 +795,7 @@ void elections_house(char canseethings)
    if(canseethings)
    {
       music.play(MUSIC_ELECTIONS);
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
 
@@ -1020,7 +1020,7 @@ void supremecourt(char clearformess,char canseethings)
    if(canseethings)
    {
       music.play(MUSIC_ELECTIONS);
-      if(clearformess) erase();
+      if(clearformess) clear();
       else makedelimiter();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(8,1);
@@ -1032,7 +1032,7 @@ void supremecourt(char clearformess,char canseethings)
    //CHANGE THINGS AND REPORT
    if(canseethings)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
 
@@ -1279,7 +1279,7 @@ void supremecourt(char clearformess,char canseethings)
    {
       if(canseethings)
       {
-         erase();
+         clear();
 
          set_color(COLOR_WHITE,COLOR_BLACK,1);
          move(0,0);
@@ -1397,7 +1397,7 @@ void congress(char clearformess,char canseethings)
    if(canseethings)
    {
       music.play(MUSIC_ELECTIONS);
-      if(clearformess) erase();
+      if(clearformess) clear();
       else makedelimiter();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(8,1);
@@ -1409,7 +1409,7 @@ void congress(char clearformess,char canseethings)
    //CHANGE THINGS AND REPORT
    if(canseethings)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
 

diff --git a/src/sitemode/shop.cpp b/src/sitemode/shop.cpp
index f6bc8c9..927c13a 100644 (file)
--- a/src/sitemode/shop.cpp
+++ b/src/sitemode/shop.cpp
@@ -144,7 +144,7 @@ void Shop::browse_halfscreen(squadst& customers, int& buyer) const
 
    while(true)
    {
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,0);
 
       locheader();
@@ -284,7 +284,7 @@ void Shop::browse_fullscreen(squadst& customers, int& buyer) const
 
    while(true)
    {
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       move(0,0);
       addstr(customers.squad[buyer]->name);
@@ -337,7 +337,7 @@ void Shop::sell_loot(squadst& customers) const
 
    while(true)
    {
-      erase();
+      clear();
 
       locheader();
       printparty();
@@ -484,7 +484,7 @@ int Shop::fenceselect(squadst& customers) const
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,0);
       move(0,0);
@@ -650,7 +650,7 @@ void Shop::maskselect(Creature &buyer) const
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(0,0);

diff --git a/src/sitemode/sitemode.cpp b/src/sitemode/sitemode.cpp
index 5a105cb..35c6ace 100644 (file)
--- a/src/sitemode/sitemode.cpp
+++ b/src/sitemode/sitemode.cpp
@@ -282,7 +282,7 @@ void mode_site()
       // Let the squad stop stressing out over the encounter if there are no enemies this round
       if(!enemy) encounter_timer=0;
 
-      erase();
+      clear();
 
       if(location[cursite]->siege.siege)
       {
@@ -1566,7 +1566,7 @@ void mode_site()
          if(c=='n')
          {
             mapshowing=false;
-            erase();
+            clear();
 
             set_color(COLOR_WHITE,COLOR_BLACK,0);
             move(0,0);
@@ -2556,7 +2556,7 @@ void resolvesite()
                pool[p]->location==cursite)
             {
                pool[p]->flag&=~CREATUREFLAG_SLEEPER;
-               erase();
+               clear();
                move(8,1);
                addstr("潜伏者の", gamelog);
                addstr(pool[p]->name, gamelog);

diff --git a/src/title/highscore.cpp b/src/title/highscore.cpp
index c7eb589..9a2713c 100644 (file)
--- a/src/title/highscore.cpp
+++ b/src/title/highscore.cpp
@@ -43,7 +43,7 @@ void viewhighscores(int musicoverride)
 
    if(!validsum)return;
 
-   erase();
+   clear();
 
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(0,0);

diff --git a/src/title/newgame.cpp b/src/title/newgame.cpp
index 802dd9e..704d505 100644 (file)
--- a/src/title/newgame.cpp
+++ b/src/title/newgame.cpp
@@ -332,7 +332,7 @@ void makecharacter()
 
    while(true)
    {
-      erase();
+      clear();
 
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(4,6);
@@ -341,7 +341,7 @@ void makecharacter()
       move(7,2);
       addstr("ファーストネーム: ");
       addstr(first[(int)gender]);
-      move(7,30);
+      move(7,52);
       set_color(COLOR_BLACK,COLOR_BLACK,1);
       addstr(" (Aを押すと両親が考え直す)");
 
@@ -349,9 +349,9 @@ void makecharacter()
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       addstr("ラストネーム: ");
       addstr(last);
-      move(9,30);
+      move(9,49);
       set_color(COLOR_BLACK,COLOR_BLACK,1);
-      addstr(" (Bを押すと別の家族に生まれる)");
+      addstr("(Bを押すと別の家族に生まれる)");
 
       move(11,2);
       set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -371,9 +371,9 @@ void makecharacter()
          set_color(COLOR_YELLOW,COLOR_BLACK,1);
          addstr("不明");
       }
-      move(11,30);
+      move(11,41);
       set_color(COLOR_BLACK,COLOR_BLACK,1);
-      addstr(" (Cを押すと生まれたときの性別が変わる)");
+      addstr("(Cを押すと生まれたときの性別が変わる)");
 
       move(13,2);
       set_color(COLOR_WHITE,COLOR_BLACK,1);
@@ -388,19 +388,18 @@ void makecharacter()
          set_color(COLOR_RED,COLOR_BLACK,1);
          addstr("運命は変えられない");
       }
-      move(13,30);
+      move(13,47);
       set_color(COLOR_BLACK,COLOR_BLACK,1);
-      addstr(" (Dを押すと子供時代を切り替える)");
-
+      addstr("(Dを押すと子供時代を切り替える)");
       if(!multipleCityMode)
       {
          move(15,2);
          set_color(COLOR_WHITE,COLOR_BLACK,1);
          addstr("都市: ");
          addstr(lcityname);
-         move(15,30);
+         move(15,55);
          set_color(COLOR_BLACK,COLOR_BLACK,1);
-         addstr(" (Eを押すと場所が代わる)");
+         addstr("(Eを押すと場所が代わる)");
       }
 
       move(19-multipleCityMode*2,4);
@@ -451,7 +450,7 @@ void makecharacter()
    }
 
    strcpy(newcr->propername,first[(int)gender]);
-   strcat(newcr->propername," ");
+   strcat(newcr->propername,"・");
    strcat(newcr->propername,last);
 
    int c;
@@ -464,7 +463,7 @@ void makecharacter()
 
    for(int q=0;q<10;q++)
    {
-      erase();
+      clear();
       set_color(COLOR_WHITE,COLOR_BLACK,1);
       move(0,0);
       addstr("革命の内側: 悲しみの子供時代");
@@ -1202,7 +1201,7 @@ void makecharacter()
       }
    }
 
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(4,2);
    addstr("新たな保守の時代", gamelog);
@@ -1253,7 +1252,7 @@ void makecharacter()
 
    getkey();
 
-   erase();
+   clear();
    set_color(COLOR_WHITE,COLOR_BLACK,1);
    move(0,0);
    addstr("あなたは人々からどのように呼ばれるか?");

diff --git a/src/title/titlescreen.cpp b/src/title/titlescreen.cpp
index 65ac6eb..0944652 100644 (file)
--- a/src/title/titlescreen.cpp
+++ b/src/title/titlescreen.cpp
@@ -65,7 +65,7 @@ This file is part of Liberal Crime Squad.
 void mode_title()
 {
    //title screen
-   erase();
+   clear();
 
    char str[100];