diff -Nru xevil-2.02r2/cmn/actual.cpp xevil-2.02r2/cmn/actual.cpp --- xevil-2.02r2/cmn/actual.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/actual.cpp 2000-01-19 20:54:36.000000000 +0000 @@ -32,7 +32,7 @@ // Include Files #if X11 -#include +#include #endif #if WIN32 #include @@ -122,7 +122,6 @@ #include "bitmaps/yeti/yeti.bitmaps" -using namespace std; ///// Some helper macros to define creatures with certain abilities. #define DEFINE_CREATURE_CTORS_2(CLASSNAME,ABILITY0,ability0,ABILITY1,ability1) \ @@ -455,9 +454,9 @@ } } - stringstream msg; - msg << "Explosion hits " << hit << " objects."; - locator->message_enq(Utils::strdup(msg.str().c_str())); + ostrstream msg; + msg << "Explosion hits " << hit << " objects." << ends; + locator->message_enq(msg.str()); kill_self(); Physical::act(); @@ -1002,7 +1001,7 @@ if (other && (other->get_class_id() != A_AltarOfSin) && (intel = other->get_intel())) { LocatorP locator = get_locator(); - stringstream str; + ostrstream str; // Turned into a frog/baby seal. if (Utils::coin_flip() && other->is_moving() && @@ -1015,8 +1014,8 @@ str << intel->get_name() << " attacks the Altar of Sin and is " << "turned into a " << (doFrog ? "frog" : "baby-seal") - << "."; - locator->message_enq(Utils::strdup(str.str().c_str())); + << "." << ends; + locator->message_enq(str.str()); other->set_intel(NULL); if (!other->get_mapped()) { @@ -1048,8 +1047,8 @@ // Lose all health. else { str << "BLASPHMER! " << intel->get_name() << - " loses health for daring to attack the Altar of Sin."; - locator->message_enq(Utils::strdup(str.str().c_str())); + " loses health for daring to attack the Altar of Sin." << ends; + locator->message_enq(str.str()); int damage = other->get_health(); other->corporeal_attack(this,damage); @@ -1076,8 +1075,8 @@ (intel = other->get_intel()) && intel->is_human()) { int lives = intel->get_lives(); LocatorP locator = get_locator(); - stringstream msg; - stringstream arenaMsg; + ostrstream msg; + ostrstream arenaMsg; // Choose different blessings to give. int n = 0; @@ -1113,8 +1112,8 @@ } else { intel->set_lives(lives + 1); - msg << intel->get_name() << " sells soul for an extra life."; - arenaMsg << "You Sold Your Soul For an Extra Life"; + msg << intel->get_name() << " sells soul for an extra life." << ends; + arenaMsg << "You Sold Your Soul For an Extra Life" << ends; } break; @@ -1124,8 +1123,8 @@ mod = new DoubleSpeed(); assert(mod); modList->append_unique(mod); - msg << intel->get_name() << " sells soul for Double Speed."; - arenaMsg << "Double Speed"; + msg << intel->get_name() << " sells soul for Double Speed." << ends; + arenaMsg << "Double Speed" << ends; break; @@ -1139,8 +1138,9 @@ mod = new DoubleJump(); assert(mod); modList->append_unique(mod); - msg << intel->get_name() << " sells soul for extra jumping powers."; - arenaMsg << "Extra Jumping Powers"; + msg << intel->get_name() << " sells soul for extra jumping powers." + << ends; + arenaMsg << "Extra Jumping Powers" << ends; break; @@ -1157,8 +1157,8 @@ // So max health takes effect immediately. other->heal(); - msg << intel->get_name() << " sells soul for Double Health."; - arenaMsg << "Double Health"; + msg << intel->get_name() << " sells soul for Double Health." << ends; + arenaMsg << "Double Health" << ends; break; @@ -1176,8 +1176,8 @@ // Might as well make sure they can take advantage of it now. other->heal(); - msg << intel->get_name() << " sells soul for Healing Powers."; - arenaMsg << "Healing Powers"; + msg << intel->get_name() << " sells soul for Healing Powers." << ends; + arenaMsg << "Healing Powers" << ends; } break; @@ -1193,8 +1193,8 @@ // Already checked that other is a Creature(). ((CreatureP)other)->add_ability(a); - msg << intel->get_name() << " sells soul for HellFire Powers."; - arenaMsg << "HellFire Powers"; + msg << intel->get_name() << " sells soul for HellFire Powers." << ends; + arenaMsg << "HellFire Powers" << ends; } break; @@ -1217,8 +1217,8 @@ // Already checked that other is a Creature(). ((CreatureP)other)->add_ability(a); - msg << intel->get_name() << " sells soul for Fireballs."; - arenaMsg << "Fireballs"; + msg << intel->get_name() << " sells soul for Fireballs." << ends; + arenaMsg << "Fireballs" << ends; } break; @@ -1241,8 +1241,8 @@ // Already checked that other is a Creature(). ((CreatureP)other)->add_ability(a); - msg << intel->get_name() << " sells soul for Flying Powers."; - arenaMsg << "Flying Powers"; + msg << intel->get_name() << " sells soul for Flying Powers." << ends; + arenaMsg << "Flying Powers" << ends; } break; @@ -1274,8 +1274,8 @@ // Already checked that other is a Creature(). ((CreatureP)other)->add_ability(a); - msg << intel->get_name() << " sells soul for Sticky Powers."; - arenaMsg << "Sticky Powers"; + msg << intel->get_name() << " sells soul for Sticky Powers." << ends; + arenaMsg << "Sticky Powers" << ends; } break; @@ -1285,8 +1285,8 @@ } } // while - locator->message_enq(Utils::strdup(msg.str().c_str())); - locator->arena_message_enq(Utils::strdup(arenaMsg.str().c_str()),other); + locator->message_enq(msg.str()); + locator->arena_message_enq(arenaMsg.str(),other); kill_self(); turnTaken = True; @@ -1534,7 +1534,7 @@ void *closure) { // notThis is used to prevent transmogifying into the same class an object // already is. - ClassId notThis = (long)closure; + ClassId notThis = (ClassId)closure; if (pc->classId == notThis) { return False; } @@ -2087,9 +2087,10 @@ PhysicalP seal = new Seal(w,l,pos); assert(seal); - stringstream str; - str << "seal-" << sealsNum; - NeutralP sealIntel = new SealIntel(w,l,Utils::strdup(str.str().c_str()),homeId); + char sealStr[20]; + ostrstream str(sealStr,20); + str << "seal-" << sealsNum << ends; + NeutralP sealIntel = new SealIntel(w,l,sealStr,homeId); seal->set_intel(sealIntel); l->register_neutral(sealIntel); seals[sealsNum] = sealIntel->get_intel_id(); diff -Nru xevil-2.02r2/cmn/area.cpp xevil-2.02r2/cmn/area.cpp --- xevil-2.02r2/cmn/area.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/area.cpp 2003-03-19 18:04:22.000000000 +0000 @@ -34,13 +34,12 @@ extern "C" { #include // For INT_MAX } -#include +#include #include "utils.h" #include "coord.h" #include "area.h" -using namespace std; Size Area::operator - (const Area &other) const { assert ((shape == AR_RECT) && (other.shape == AR_RECT)); diff -Nru xevil-2.02r2/cmn/coord.h xevil-2.02r2/cmn/coord.h --- xevil-2.02r2/cmn/coord.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/coord.h 2000-01-19 20:54:12.000000000 +0000 @@ -619,7 +619,7 @@ int enemiesInitial; // enemies on first level int enemiesIncr; // this many more enemies each level int enemiesMax; // maximum number of enemies (for levels) - const char *name; // of this difficulty level + char *name; // of this difficulty level }; enum {DIFF_TRIVIAL,DIFF_NORMAL,DIFF_HARD,DIFF_BEND_OVER, DIFFICULTY_LEVELS_NUM, DIFF_NONE=DIFFICULTY_LEVELS_NUM}; diff -Nru xevil-2.02r2/cmn/game.cpp xevil-2.02r2/cmn/game.cpp --- xevil-2.02r2/cmn/game.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/game.cpp 2003-03-23 06:20:00.000000000 +0000 @@ -31,17 +31,16 @@ #include "stdafx.h" extern "C" { #include -#include } #if X11 -#include +#include #endif #if WIN32 #include #endif -#include +#include #include "utils.h" #include "coord.h" @@ -124,7 +123,7 @@ #define SOUNDONOFF_DEFAULT True -const char *Game::wittySayings[Game::WITTY_SAYINGS_NUM] = { +char *Game::wittySayings[Game::WITTY_SAYINGS_NUM] = { "If it moves it's a threat. If it doesn't move it's a potential threat.", "Happy, happy. Joy, joy.", "For the mother country!!!", @@ -272,19 +271,11 @@ "Prepare to Qualify.", "I got a bad feeling about this drop.", "Cowboys never quit!", - "The voices say I'm not crazy, so I'm OK!", - "Cure Sars!?!", - "Ha Ha Ha, Loser!", - "It's all fun and games until someone loses an eye.", - "Eye for an eye, tooth for a tooth.", - "Mo-o-m!", - "Timmy's touching me!", - "I'm not touching you! See? I'm not touching you!" }; -const char *Game::intelNames[Game::INTEL_NAMES_NUM] = { +char *Game::intelNames[Game::INTEL_NAMES_NUM] = { "Dr. Pain", "Steve", "hardts", @@ -359,9 +350,6 @@ "Stan", "Mr. Hat", "Cid", - "Mr. Hankey", - "Michael Jackson", - "O.J. Simpson" }; @@ -577,7 +565,7 @@ assert(maximums[weapons[n]->classId] == 0); // Don't allow objectWorldPercent values that are too small. - float objWPercent = (float)MAX(weapons[n]->objectWorldPercent, + float objWPercent = (float)max(weapons[n]->objectWorldPercent, OBJECT_WORLD_PERCENT_MIN); maximums[weapons[n]->classId] = (int)ceil(areaFactor * objWPercent); @@ -590,7 +578,7 @@ for (n = 0; n < oItemsNum; n++) { // Check not already set. assert(maximums[oItems[n]->classId] == 0); - float objWPercent = (float)MAX(oItems[n]->objectWorldPercent, + float objWPercent = (float)max(oItems[n]->objectWorldPercent, OBJECT_WORLD_PERCENT_MIN); maximums[oItems[n]->classId] = (int)ceil(areaFactor * objWPercent); @@ -805,7 +793,7 @@ // Just for tracing in the debugger. char* version = Utils::get_OS_info(); - delete [] version; + delete version; noUi = False; noNewLevel = False; @@ -1068,7 +1056,7 @@ Game::~Game() { if (oneItem) { - delete [] oneItem; + delete oneItem; } delete ui; @@ -1512,13 +1500,13 @@ if (mask & UIconnectServer) { delete role; - stringstream portName; - portName << settings.connectPort; + ostrstream portName; + portName << settings.connectPort << ends; IViewportInfo* vInfo = Ui::get_viewport_info(); - ClientP client = new Client(settings.connectHostname, - Utils::strdup(portName.str().c_str()), + ClientP client = new Client(settings.connectHostname,portName.str(), 0,settings.humanName,vInfo, Connection::ADJUST_SKIP,&locator); + delete portName.str(); assert(client); role = client; ui->set_role_type(role->get_type()); @@ -1556,9 +1544,10 @@ } delete role; - stringstream portName; - portName << settings.serverPort; - role = new Server(settings.localHuman,portName.str().c_str(),&locator); + ostrstream portName; + portName << settings.serverPort << ends; + role = new Server(settings.localHuman,portName.str(),&locator); + delete portName.str(); assert(role); restartEnd = RE_RESTART; ui->set_role_type(role->get_type()); @@ -1584,9 +1573,9 @@ ui->set_style(styleType); } - stringstream str; + ostrstream str; styleNext->describe(str); - locator.message_enq(Utils::strdup(str.str().c_str())); + locator.message_enq(str.str()); } @@ -1600,9 +1589,9 @@ human->reincarnate(); obj->set_intel(human); - stringstream msg; - msg << human->get_name() << " is back from the dead."; - locator.message_enq(Utils::strdup(msg.str().c_str())); + ostrstream msg; + msg << human->get_name() << " is back from the dead." << ends; + locator.message_enq(msg.str()); } } @@ -1626,7 +1615,7 @@ void Game::new_level_check(int enemiesPlaying) { assert(state == gameOn); - stringstream str; + ostrstream str; Boolean lStrChanged = False; int val = style->new_level_check(enemiesPlaying,&world,&locator, level,lStrChanged,str,timer, @@ -1656,8 +1645,11 @@ // if str has anything in it. Fucking Linux compilers. if (lStrChanged) { if (ui) { - ui->set_level(str.str().c_str()); + ui->set_level(str.str()); } + // Ok to delete even if ui is NULL, str.str() will allocate the memory to + // kill off. + delete str.str(); } } @@ -1849,7 +1841,7 @@ -const char *Game::choose_ranking(int kills) { +char *Game::choose_ranking(int kills) { // Figure out the ranking set, they are listed in order. int setNum = 0; assert(kills >= 0 && rankingSets[0].killsMin == 0); @@ -1884,7 +1876,7 @@ if (showMessages) { for (int n = 0; n < locator.humans_registered(); n++) { HumanP human = locator.get_human(n); - stringstream msg; + ostrstream msg; // Soups are only taken into account if you have unlimited lives. int totalKills; @@ -1902,11 +1894,11 @@ totalKills = human->get_human_kills() + human->get_enemy_kills(); } - const char *ranking = choose_ranking(totalKills); + char *ranking = choose_ranking(totalKills); msg << totalKills << (totalKills == 1 ? "Kill" : " Kills") - << ", Rank: " << ranking; + << ", Rank: " << ranking << ends; IntelId humanIntelId = human->get_intel_id(); - locator.arena_message_enq(Utils::strdup(msg.str().c_str()),&humanIntelId,10000); + locator.arena_message_enq(msg.str(),&humanIntelId,10000); } } } @@ -1927,8 +1919,8 @@ // Will clean out non-persistent teams. locator.level_reset(); - stringstream lStr; // For level box on the side of the ui-> - stringstream lTitleStr; // For Ui title screen. + ostrstream lStr; // For level box on the side of the ui-> + ostrstream lTitleStr; // For Ui title screen. Boolean doBonus; // Possibly increment level count number. @@ -1968,7 +1960,7 @@ if (doBonus) { delete levelTitleStored; // If it already exists. // Store levelTitle string for later use. - levelTitleStored = Utils::strdup(lTitleStr.str().c_str()); + levelTitleStored = lTitleStr.str(); // Tell user about the bonus. award_bonuses_now(); @@ -1978,12 +1970,13 @@ } // Go to getBearings state. else { - get_bearings(Utils::strdup(lTitleStr.str().c_str())); + get_bearings(lTitleStr.str()); } if (ui) { - ui->set_level(lStr.str().c_str()); + ui->set_level(lStr.str()); } + delete lStr.str(); // Will pass in more info later. role->new_level(this,&world,&locator); @@ -2004,7 +1997,7 @@ continue; } - const char* awardMsg = NULL; + char* awardMsg = NULL; int count = 0; while (!awardMsg && count < AWARD_BONUS_TRIES) { count++; @@ -2191,9 +2184,9 @@ // Moved resetting world rooms to new_level(); - stringstream msg; - msg << wittySayings[Utils::choose(WITTY_SAYINGS_NUM)]; - locator.message_enq(Utils::strdup(msg.str().c_str())); + ostrstream msg; + msg << wittySayings[Utils::choose(WITTY_SAYINGS_NUM)] << ends; + locator.message_enq(msg.str()); /* Don't need to call Ui::set_* because the new values originally came from ui-> */ @@ -2249,39 +2242,41 @@ { // Right keys. right[n][which] = 0; - stringstream strm; + ostrstream strm; if (which == 0) - strm << "right_" << keysNames[n]; + strm << "right_" << keysNames[n] << ends; else - strm << "right_" << keysNames[n] << "_2"; - const string & option = strm.str(); + strm << "right_" << keysNames[n] << "_2" << ends; + char *option = strm.str(); // Should we free value?? - char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option.c_str()); + char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option); if (value) { KeySym keysym = XStringToKeysym(value); if (keysym != NoSymbol) right[n][which] = keysym; } + delete option; } { // Left Keys. left[n][which] = 0; - stringstream strm; + ostrstream strm; if (which == 0) - strm << "left_" << keysNames[n]; + strm << "left_" << keysNames[n] << ends; else - strm << "left_" << keysNames[n] << "_2"; - const string & option = strm.str(); + strm << "left_" << keysNames[n] << "_2" << ends; + char *option = strm.str(); // Should we free value?? - char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option.c_str()); + char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option); if (value) { KeySym keysym = XStringToKeysym(value); if (keysym != NoSymbol) left[n][which] = keysym; } + delete option; } } @@ -2296,10 +2291,10 @@ void Game::parse_args(int *argc,char **argv) { // Create a bunch of "-name" strings for comparing with command-line // args. - stringstream dashName[Locator::HUMANS_MAX]; + ostrstream dashName[Locator::HUMANS_MAX]; int n; for (n = 0; n < Locator::HUMANS_MAX; n++) { - dashName[n] << "-name" << n; + dashName[n] << "-name" << n << ends; } // Defaults @@ -2356,7 +2351,7 @@ // Check "-name" arguments. else { for (int j = 0; j < Locator::HUMANS_MAX; j++) { - if ((! strcmp(dashName[j].str().c_str(),argv[n])) && (n + 1 < *argc)) { + if ((! strcmp(dashName[j].str(),argv[n])) && (n + 1 < *argc)) { humanNames[j] = Utils::strdup(argv[n+1]); n++; } @@ -2733,6 +2728,12 @@ n++; } } // for + + + // Delete memory for "-name" strings. + for (n = 0; n < Locator::HUMANS_MAX; n++) { + delete dashName[n].str(); + } } @@ -2740,15 +2741,15 @@ char **Game::display_names(int *argc,char **argv) { #if X11 - stringstream dashDisplay[UI_VIEWPORTS_MAX][2]; + ostrstream dashDisplay[UI_VIEWPORTS_MAX][2]; char **displayNames = new charP [UI_VIEWPORTS_MAX]; int n; for (n = 0; n < UI_VIEWPORTS_MAX; n++) { displayNames[n] = new char [Xvars::DISPLAY_NAME_LENGTH]; strcpy(displayNames[n],""); - dashDisplay[n][0] << "-display" << n; - dashDisplay[n][1] << "-d" << n; + dashDisplay[n][0] << "-display" << n << ends; + dashDisplay[n][1] << "-d" << n << ends; } // Loop through all command line arguments. @@ -2764,7 +2765,7 @@ // Set display name for one viewport. for (int m = 0; m < UI_VIEWPORTS_MAX; m++) { for (int which = 0; which < 2; which++) { - if (!strcmp(argv[n],dashDisplay[m][which].str().c_str())) { + if (!strcmp(argv[n],dashDisplay[m][which].str())) { assert(strlen(argv[n+1]) < Xvars::DISPLAY_NAME_LENGTH); strcpy(displayNames[m],argv[n+1]); } @@ -2772,6 +2773,11 @@ } } + for (n = 0; n < UI_VIEWPORTS_MAX; n++) { + for (int which = 0; which < 2; which++) { + delete dashDisplay[n][which].str(); + } + } return displayNames; #endif @@ -2884,7 +2890,7 @@ assert(role->get_type() != R_CLIENT); // Choose random name if -name was not specified for this player. - const char *nameNonPc = + char *nameNonPc = Utils::strlen(humanNames[h]) ? humanNames[h] : intelNames[intelNamesIndices[h % INTEL_NAMES_NUM]]; @@ -2948,12 +2954,13 @@ // Put message in the status bar when the game starts up. // Use \n in string for locator.message_enq. - stringstream msg; + ostrstream msg; msg << "XEvil(TM) " << VERSION << " http://www.xevil.com satan@xevil.com " << XETP::versionStr << "\n" - << "Copyright(C) 1994,2000 Steve Hardt and Michael Judge"; - locator.message_enq(Utils::strdup(msg.str().c_str())); + << "Copyright(C) 1994,2000 Steve Hardt and Michael Judge" + << ends; + locator.message_enq(msg.str()); // Print message to standard out. Doesn't really do anything on Windows. @@ -3068,10 +3075,11 @@ IntelOptions ops; ITmask opMask = intel_options_for(ops,obj->get_class_id()); - stringstream name; - name << "Machine-" << (enemyNameCount++); - EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(),&ops,opMask); + ostrstream name; + name << "Machine-" << (enemyNameCount++) << ends; + EnemyP enemy = new Enemy(&world,&locator,name.str(),&ops,opMask); assert(enemy); + delete name.str(); locator.register_enemy(enemy); if (addToLocator) { @@ -3227,13 +3235,14 @@ switch (Utils::choose(8)) { case 0: { // A bunch of Heros and an Alien. for (int n = 0; n < 10; n++) { - stringstream name; - name << "Enemy-" << n; + ostrstream name; + name << "Enemy-" << n << ends; IntelOptions ops; ops.harmless = True; - EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), + EnemyP enemy = new Enemy(&world,&locator,name.str(), &ops,ITharmless); assert(enemy); + delete name.str(); locator.register_enemy(enemy); Pos pos = world.empty_rect(Hero::get_size_max()); @@ -3259,15 +3268,16 @@ case 1: { // Hero, FThrower, and a bunch of Frogs (does not mean Frenchmen). for (int n = 0; n < 15; n++) { - stringstream name; - name << "Enemy-" << n; + ostrstream name; + name << "Enemy-" << n << ends; IntelOptions ops; ops.psychotic = Utils::coin_flip(); - EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), + EnemyP enemy = new Enemy(&world,&locator,name.str(), &ops,ITpsychotic); assert(enemy); + delete name.str(); locator.register_enemy(enemy); - + Pos pos = world.empty_rect(Frog::get_size_max()); PhysicalP obj = new Frog(&world,&locator,pos); assert(obj); @@ -3294,14 +3304,15 @@ case 2: { // A bunch of Enforcers. for (int n = 0; n < 10; n++) { - stringstream name; - name << "Enemy-" << n; + ostrstream name; + name << "Enemy-" << n << ends; IntelOptions ops; ops.classFriends = False; ops.psychotic = True; - EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), + EnemyP enemy = new Enemy(&world,&locator,name.str(), &ops,ITclassFriends|ITpsychotic); assert(enemy); + delete name.str(); locator.register_enemy(enemy); Pos pos = world.empty_rect(Enforcer::get_size_max()); @@ -3316,13 +3327,14 @@ case 3: { // A bunch of Ninjas and a chainsaw. for (int n = 0; n < 10; n++) { - stringstream name; - name << "Enemy-" << n; + ostrstream name; + name << "Enemy-" << n << ends; IntelOptions ops; ops.classFriends = False; - EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), + EnemyP enemy = new Enemy(&world,&locator,name.str(), &ops,ITclassFriends); assert(enemy); + delete name.str(); locator.register_enemy(enemy); Pos pos = world.empty_rect(Ninja::get_size_max()); @@ -3361,11 +3373,12 @@ } for (int m = 0; m < 10; m++) { - stringstream name; - name << "Enemy-" << m; - EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), + ostrstream name; + name << "Enemy-" << m << ends; + EnemyP enemy = new Enemy(&world,&locator,name.str(), NULL,ITnone); assert(enemy); + delete name.str(); locator.register_enemy(enemy); Pos pos = world.empty_rect(Hero::get_size_max()); @@ -3401,13 +3414,14 @@ case 5: { // Ninjas and ChopperBoys. int n; for (n = 0; n < 10; n++) { - stringstream name; - name << "Enemy-" << n; + ostrstream name; + name << "Enemy-" << n << ends; IntelOptions ops; ops.classFriends = False; - EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), + EnemyP enemy = new Enemy(&world,&locator,name.str(), &ops,ITclassFriends); assert(enemy); + delete name.str(); locator.register_enemy(enemy); PhysicalP obj; @@ -3444,10 +3458,11 @@ // and the scenario isn't set up yet. for (n = 0; n < 9; n++) { - stringstream name; - name << "Dog-" << n; - EnemyP intel = new Enemy(&world,&locator,name.str().c_str(),NULL,ITnone); + ostrstream name; + name << "Dog-" << n << ends; + EnemyP intel = new Enemy(&world,&locator,name.str(),NULL,ITnone); assert(intel); + delete name.str(); locator.register_enemy(intel); Pos pos = world.empty_rect(Dog::get_size_max()); @@ -3458,12 +3473,13 @@ } for (n = 0; n < 3; n++) { - stringstream name; - name << "Enemy-" << n; + ostrstream name; + name << "Enemy-" << n << ends; IntelOptions ops; ops.harmless = True; - EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(),&ops,ITharmless); + EnemyP enemy = new Enemy(&world,&locator,name.str(),&ops,ITharmless); assert(enemy); + delete name.str(); locator.register_enemy(enemy); PhysicalP obj; @@ -3494,12 +3510,13 @@ Segmented::create_and_add_composite(ret,&world,&locator,Dragon::SEGMENTS_NUM,pos, Dragon::create,NULL); for (int m = 0; m < ret.length(); m++) { - stringstream name; - name << "Enemy-" << n; + ostrstream name; + name << "Enemy-" << n << ends; IntelOptions ops; ops.harmless = True; - EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(),&ops,ITharmless); + EnemyP enemy = new Enemy(&world,&locator,name.str(),&ops,ITharmless); assert(enemy); + delete name.str(); locator.register_enemy(enemy); PhysicalP p = (PhysicalP)ret.get(m); p->set_intel(enemy); diff -Nru xevil-2.02r2/cmn/game.h xevil-2.02r2/cmn/game.h --- xevil-2.02r2/cmn/game.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/game.h 2003-03-23 04:44:32.000000000 +0000 @@ -35,7 +35,7 @@ extern "C" { #include } -#include +#include #include "utils.h" #include "ui.h" #include "world.h" @@ -136,7 +136,7 @@ struct RankingSet { enum {RANKING_SET_MAX = 8}; // Max number of rankings in a set. int killsMin; // Min number of kills to get this rank. - const char *rankings[RANKING_SET_MAX + 1]; // Extra for NULL. + char *rankings[RANKING_SET_MAX + 1]; // Extra for NULL. }; @@ -268,8 +268,8 @@ private: enum { - WITTY_SAYINGS_NUM = 155, - INTEL_NAMES_NUM = 77, + WITTY_SAYINGS_NUM = 147, + INTEL_NAMES_NUM = 74, RANKING_SETS_NUM = 12, }; @@ -306,7 +306,7 @@ static Boolean potential_enemy_filter(const PhysicalContext* pc,void*); /* EFFECTS: Filter those classes whose potentialEnemy flag is True. */ - const char *choose_ranking(int kills); + char *choose_ranking(int kills); /* EFFECTS: Choose a rank for the player at the end of game based on the number of kills. */ @@ -412,8 +412,8 @@ SoundName currentSoundName; //keeps track of current sound track being played: can be 0 - static const char *wittySayings[WITTY_SAYINGS_NUM]; - static const char *intelNames[INTEL_NAMES_NUM]; + static char *wittySayings[WITTY_SAYINGS_NUM]; + static char *intelNames[INTEL_NAMES_NUM]; static DifficultyLevel difficultyLevels[DIFFICULTY_LEVELS_NUM]; static RankingSet rankingSets[RANKING_SETS_NUM]; diff -Nru xevil-2.02r2/cmn/game_style.cpp xevil-2.02r2/cmn/game_style.cpp --- xevil-2.02r2/cmn/game_style.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/game_style.cpp 2003-03-23 04:47:42.000000000 +0000 @@ -33,9 +33,15 @@ #include } -#include +#if X11 +#include +#endif + +#if WIN32 +#include +#endif -#include +#include #include "utils.h" #include "coord.h" #include "world.h" @@ -103,13 +109,13 @@ /* DEFAULT: True */ virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP) = 0; virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &) = 0; virtual void new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum) = 0; /* EFFECTS: These two functions start a new level in a scenario. setup_world() should just setup the map and size of the world. new_level() is called after world.reset() @@ -152,13 +158,13 @@ virtual ScenarioType get_scenario_type() {return EXTERMINATE;} virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); virtual void new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum); @@ -177,13 +183,13 @@ virtual Boolean can_refill_game_objects(); virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); virtual void new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum); virtual void new_level_set_timer(Timer &timer); @@ -203,7 +209,7 @@ virtual ScenarioType get_scenario_type() {return HIVE;} virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual Boolean award_bonus(); @@ -212,7 +218,7 @@ virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); virtual void new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum); virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); @@ -236,13 +242,13 @@ virtual ScenarioType get_scenario_type() {return CAPTURE_THE_FLAG;} virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); virtual void new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum); virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); @@ -263,7 +269,7 @@ virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); virtual void new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum); virtual Boolean advance_level(); @@ -286,7 +292,7 @@ virtual Boolean (*get_team())(LocatorP,PhysicalP,PhysicalP) = 0; - virtual void set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr) = 0; + virtual void set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr) = 0; /* EFFECTS: Called in new_level() to set the appropriate messages. */ @@ -305,7 +311,7 @@ virtual ScenarioType get_scenario_type() {return SEALS;} virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual Boolean award_bonus(); @@ -317,7 +323,7 @@ #endif virtual Boolean (*get_team())(LocatorP,PhysicalP,PhysicalP); - virtual void set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr); + virtual void set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr); private: @@ -336,7 +342,7 @@ virtual ScenarioType get_scenario_type() {return ANTI_SEALS;} virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); @@ -345,7 +351,7 @@ #endif virtual Boolean (*get_team())(LocatorP,PhysicalP,PhysicalP); - virtual void set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr); + virtual void set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr); private: @@ -363,13 +369,13 @@ virtual SoundName get_midisoundtrack(){return SoundNames::FIRE_SOUNDTRACK;} virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); virtual void new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum); virtual Boolean award_bonus(); @@ -385,13 +391,13 @@ virtual ScenarioType get_scenario_type() {return KILL_THE_DRAGON;} virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); virtual void new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum); virtual SoundName get_midisoundtrack(){return SoundNames::FIRE_SOUNDTRACK;} @@ -413,13 +419,13 @@ virtual Pos human_initial_pos(WorldP,LocatorP,const Size &s); virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); virtual void new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum); virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); @@ -441,13 +447,13 @@ virtual ScenarioType get_scenario_type() {return THE_POUND;} virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); virtual void new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum); }; @@ -460,13 +466,13 @@ virtual ScenarioType get_scenario_type() {return JAPAN_TOWN;} virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); virtual void new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum); virtual void filter_weapons_and_other_items(LocatorP,int &weaponsNum, @@ -575,7 +581,7 @@ int GameStyle::new_level_check(int,WorldP,LocatorP, - int,Boolean &,stringstream &,Timer &timer, + int,Boolean &,ostrstream &,Timer &timer, IPhysicalManagerP) { // A timer-based level. if (timer.ready()) { @@ -785,8 +791,8 @@ -void Normal::describe(stringstream &str) { - str << "Complete each level/scenario to proceed to the next one."; +void Normal::describe(ostrstream &str) { + str << "Complete each level/scenario to proceed to the next one." << ends; } @@ -846,7 +852,7 @@ int Normal::new_level_check(int enemiesPlaying,WorldP w,LocatorP l, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP manager) { GameStyleP delegate = get_delegate(); return delegate->new_level_check(enemiesPlaying,w,l,level,lStrChanged,levelStr,timer,manager); @@ -870,7 +876,7 @@ void Normal::new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum) { // Choose which delegate to use. if (level % NORMAL_SCENARIOS_FREQUENCY == 0) { @@ -928,10 +934,11 @@ -void Levels::describe(stringstream &str) { +void Levels::describe(ostrstream &str) { str << "Human player(s) fights through increasing levels of " << "difficulty." << "\n" - << "To complete a level you must kill all enemy players."; + << "To complete a level you must kill all enemy players." + << ends; } @@ -962,7 +969,7 @@ int Levels::new_level_check(int enemiesPlaying,WorldP,LocatorP, - int,Boolean &,stringstream &,Timer &, + int,Boolean &,ostrstream &,Timer &, IPhysicalManagerP) { if (enemiesPlaying == 0) { return 1; @@ -976,7 +983,7 @@ void Levels::new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int) { world->reset(); @@ -984,8 +991,8 @@ clean_physicals(False,world,locator,manager); - lTitleStr << "[" << level << "] Kill All Machines"; - lStr << "Level: " << level; + lTitleStr << "[" << level << "] Kill All Machines" << ends; + lStr << "Level: " << level << ends; enemiesNum += dLevel.enemiesIncr; enemiesNum = Utils::minimum(enemiesNum,dLevel.enemiesMax); @@ -1030,8 +1037,8 @@ -void KillKillKill::describe(stringstream &str) { - str << "Every human and machine for him/her/itself."; +void KillKillKill::describe(ostrstream &str) { + str << "Every human and machine for him/her/itself." << ends; } @@ -1088,15 +1095,15 @@ void KillKillKill::new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int) { world->reset(); // Don't wipe out the Enemies. clean_physicals(True,world,locator,manager); - lTitleStr << "Level: " << level; - lStr << "Level: " << level; + lTitleStr << "Level: " << level << ends; + lStr << "Level: " << level << ends; // Only create enemies first time or if enemiesRefill is set. if (justReset) { @@ -1145,9 +1152,9 @@ -void Duel::describe(stringstream &str) { +void Duel::describe(ostrstream &str) { str << "Human vs. human battle to the death." - << "\n" << "Each human has 3 lives."; + << "\n" << "Each human has 3 lives." << ends; } @@ -1200,13 +1207,13 @@ void Duel::new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int) { world->reset(); clean_physicals(False,world,locator,manager); - lTitleStr << "Level: " << level; - lStr << "Level: " << level; + lTitleStr << "Level: " << level << ends; + lStr << "Level: " << level << ends; // Only create enemies first time. if (justReset) { @@ -1249,9 +1256,9 @@ -void ExtendedDuel::describe(stringstream &str) { +void ExtendedDuel::describe(ostrstream &str) { str << "Human vs. human battle to the death." - << "\n" << "Unlimited lives."; + << "\n" << "Unlimited lives." << ends; } @@ -1311,13 +1318,13 @@ void ExtendedDuel::new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int) { world->reset(); clean_physicals(False,world,locator,manager); - lTitleStr << "Level: " << level; - lStr << "Level: " << level; + lTitleStr << "Level: " << level << ends; + lStr << "Level: " << level << ends; // Only create enemies first time. if (justReset) { @@ -1360,8 +1367,8 @@ -void Training::describe(stringstream &str) { - str << "No enemies. Useful for learning the controls."; +void Training::describe(ostrstream &str) { + str << "No enemies. Useful for learning the controls." << ends; } @@ -1385,13 +1392,13 @@ void Training::new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int) { world->reset(); clean_physicals(False,world,locator,manager); - lTitleStr << "Level: " << level; - lStr << "Level: " << level; + lTitleStr << "Level: " << level << ends; + lStr << "Level: " << level << ends; } @@ -1421,10 +1428,10 @@ -void Scenarios::describe(stringstream &str) { +void Scenarios::describe(ostrstream &str) { str << "A number of different scenarios." << "\n" << "You must complete each scenario to continue on to the " - << "next one."; + << "next one." << ends; } @@ -1492,7 +1499,7 @@ int Scenarios::new_level_check(int enemiesPlaying,WorldP w,LocatorP l, int level,Boolean &lStrChanged, - stringstream &levelStr,Timer &timer, + ostrstream &levelStr,Timer &timer, IPhysicalManagerP manager) { assert(scenario); return scenario->new_level_check(enemiesPlaying,w,l,level, @@ -1527,7 +1534,7 @@ void Scenarios::new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int humansNum) { // Works even if scenario is NULL. if (!scenario || scenario->advance_level()) { @@ -1797,7 +1804,7 @@ int Exterminate::new_level_check(int enemiesPlaying,WorldP,LocatorP, - int,Boolean &,stringstream &,Timer &, + int,Boolean &,ostrstream &,Timer &, IPhysicalManagerP) { if (enemiesPlaying == 0) { return 1; @@ -1815,10 +1822,10 @@ void Exterminate::new_level(int level,WorldP,LocatorP, const DifficultyLevel &dLevel, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int) { - lTitleStr << "[" << level << "] EXTERMINATE"; - lStr << "[" << level << "] EXTERMINATE\nKill all machines."; + lTitleStr << "[" << level << "] EXTERMINATE" << ends; + lStr << "[" << level << "] EXTERMINATE\nKill all machines." << ends; // Doesn't increment like LEVELS game style enemiesNum = dLevel.enemiesIncr; @@ -1845,7 +1852,7 @@ int Bonus::new_level_check(int,WorldP,LocatorP locator, int level,Boolean &lStrChanged, - stringstream &levelStr,Timer &timer, + ostrstream &levelStr,Timer &timer, IPhysicalManagerP) { // Ran out of time. if (timer.ready()) { @@ -1866,13 +1873,13 @@ if (remaining != frogsRemaining) { frogsRemaining = remaining; levelStr << "[" << level << "] BONUS LEVEL\nfrogs remaining: " - << remaining; + << remaining << ends; lStrChanged = True; if (remaining > 0) { - stringstream arenaStr; + ostrstream arenaStr; arenaStr << remaining << " Frog" << - (remaining > 1 ? "s" : "") << " Remaining"; - locator->arena_message_enq(Utils::strdup(arenaStr.str().c_str())); + (remaining > 1 ? "s" : "") << " Remaining" << ends; + locator->arena_message_enq(arenaStr.str()); } // Will only be called once per level. @@ -1900,7 +1907,7 @@ void Bonus::new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int) { // Create frogs for (int n = 0; n < SCENARIO_BONUS_FROGS; n++) { @@ -1933,9 +1940,9 @@ frogsRemaining = SCENARIO_BONUS_FROGS; lTitleStr << "[" << level << "] Bonus Level: Kill " - << (int)SCENARIO_BONUS_FROGS << " Frogs"; + << (int)SCENARIO_BONUS_FROGS << " Frogs" << ends; lStr << "[" << level << "] BONUS LEVEL\nfrogs remaining: " - << (int)SCENARIO_BONUS_FROGS; + << (int)SCENARIO_BONUS_FROGS << ends; } @@ -1953,7 +1960,7 @@ int Hive::new_level_check(int,WorldP,LocatorP locator, - int,Boolean &,stringstream &,Timer &, + int,Boolean &,ostrstream &,Timer &, IPhysicalManagerP) { PhysicalP xit = locator->lookup(xitId); assert(xit); // The Xit should never be destroyed. @@ -1980,7 +1987,7 @@ void Hive::new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int) { // Aliens are created in Game::clock. @@ -2005,8 +2012,8 @@ locator->add(egg); } - lTitleStr << "[" << level << "] HIVE"; - lStr << "[" << level << "] HIVE.\nFind the exit."; + lTitleStr << "[" << level << "] HIVE" << ends; + lStr << "[" << level << "] HIVE.\nFind the exit." << ends; } @@ -2066,7 +2073,7 @@ int CaptureTheFlag::new_level_check(int,WorldP,LocatorP locator, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &, IPhysicalManagerP manager) { int fRemaining = 0; for (int n = 0; n < SCENARIO_FLAG_FLAGS; n++) { @@ -2084,19 +2091,19 @@ flagsRemaining = fRemaining; levelStr << "[" << level << "] COLLECT " << (int)SCENARIO_FLAG_FLAGS - << " FLAGS\nremaining: "<< flagsRemaining; + << " FLAGS\nremaining: "<< flagsRemaining << ends; lStrChanged = True; - stringstream arenaStr; + ostrstream arenaStr; if (fRemaining != 0) { arenaStr << flagsRemaining << " Flag" << - (flagsRemaining > 1 ? "s" : "") << " Remaining"; + (flagsRemaining > 1 ? "s" : "") << " Remaining" << ends; } else { - arenaStr << "All Flags Collected"; + arenaStr << "All Flags Collected" << ends; } - locator->arena_message_enq(Utils::strdup(arenaStr.str().c_str())); + locator->arena_message_enq(arenaStr.str()); } if (fRemaining == 0) { // All flags are gone, so end level. @@ -2117,7 +2124,7 @@ void CaptureTheFlag::new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP,int) { for (int n = 0; n < SCENARIO_FLAG_FLAGS; n++) { Pos pos = world->empty_accessible_rect(Flag::get_size_max()); @@ -2129,9 +2136,9 @@ flagsRemaining = SCENARIO_FLAG_FLAGS; lTitleStr << "[" << level << "] Capture The Flag: " - << (int)SCENARIO_FLAG_FLAGS << " Flags"; + << (int)SCENARIO_FLAG_FLAGS << " Flags" << ends; lStr << "[" << level << "] COLLECT " << (int)SCENARIO_FLAG_FLAGS - << " FLAGS.\nremaining: " << (int)SCENARIO_FLAG_FLAGS; + << " FLAGS.\nremaining: " << (int)SCENARIO_FLAG_FLAGS << ends; } @@ -2162,7 +2169,7 @@ void GenericSeals::new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP,int) { // Add a team for each human in the game. // Don't use locator->humans_registered() because they may not have been @@ -2291,7 +2298,7 @@ int Seals::new_level_check(int,WorldP,LocatorP locator, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &, IPhysicalManagerP) { int lemOut,lemSafe,lemActive,lemDead; compute_out_safe_active_dead(locator,lemOut,lemSafe,lemActive,lemDead); @@ -2305,10 +2312,10 @@ // Only update arena string if sealsSafe has changed. if (lemSafe != sealsSafe && lemSafe != SCENARIO_SEALS_NEED) { - stringstream arenaStr; + ostrstream arenaStr; arenaStr << "Save " << (SCENARIO_SEALS_NEED - lemSafe) - << " More Baby Seals"; - locator->arena_message_enq(Utils::strdup(arenaStr.str().c_str())); + << " More Baby Seals" << ends; + locator->arena_message_enq(arenaStr.str()); } sealsSafe = lemSafe; @@ -2317,17 +2324,18 @@ levelStr << "[" << level << "] SAVE " << (int)SCENARIO_SEALS_NEED << " BABY SEALS\n" << "out: " << sealsOut << " safe: " << sealsSafe - << " dead: " << lemDead; + << " dead: " << lemDead + << ends; lStrChanged = True; // New level if enough seals are safe or too many are dead. if (lemDead > (SCENARIO_SEALS_SEALS - SCENARIO_SEALS_NEED) || lemSafe >= SCENARIO_SEALS_NEED) { if (lemSafe < SCENARIO_SEALS_NEED) { - stringstream msg; + ostrstream msg; msg << "YOU FAILED TO SAVE " << (int)SCENARIO_SEALS_NEED - << " BABY SEALS. TRY THIS LEVEL AGAIN."; - locator->arena_message_enq(Utils::strdup(msg.str().c_str())); + << " BABY SEALS. TRY THIS LEVEL AGAIN." << ends; + locator->arena_message_enq(msg.str()); } else { locator->arena_message_enq(Utils::strdup("Good work. Go to the next level.")); @@ -2357,10 +2365,11 @@ -void Seals::set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr) { - lTitleStr << "[" << level << "] SAVE THE BABY SEALS"; +void Seals::set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr) { + lTitleStr << "[" << level << "] SAVE THE BABY SEALS" << ends; lStr << "[" << level << "] SAVE "<< - (int)SCENARIO_SEALS_NEED << " BABY SEALS\n" << "out: 0 safe: 0 dead: 0"; + (int)SCENARIO_SEALS_NEED << " BABY SEALS\n" + << "out: 0 safe: 0 dead: 0" << ends; } @@ -2421,7 +2430,7 @@ int AntiSeals::new_level_check(int,WorldP,LocatorP locator, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &, IPhysicalManagerP) { // level not over by default. int ret = -1; @@ -2432,13 +2441,15 @@ // Failure if (lemSafe > SCENARIO_ANTI_SEALS_MAX_SLIPPAGE) { + ostrstream msg; #if 0 // Not enough space on screen, need two lines. msg << "YOU LET TOO MANY OF THE FAT BASTARDS GET AWAY\n" << "Try this level again" << ends; #else + msg << "YOU LET TOO MANY OF THE FAT BASTARDS GET AWAY" << ends; #endif - locator->arena_message_enq(Utils::strdup("YOU LET TOO MANY OF THE FAT BASTARDS GET AWAY")); + locator->arena_message_enq(msg.str()); // start new level ret = 1; @@ -2462,11 +2473,13 @@ } // Update UI else if (lemSafe == sealsSafe) { // o.w. the "one got away" message takes priority - stringstream arenaStr; - arenaStr << "Kill " << lemToKill << " More Baby Seals"; - locator->arena_message_enq(Utils::strdup(arenaStr.str().c_str())); + ostrstream arenaStr; + arenaStr << "Kill " + << lemToKill << " More Baby Seals" << ends; + locator->arena_message_enq(arenaStr.str()); - levelStr << "[" << level << "] KILL " << lemToKill << " BABY SEALS"; + levelStr << "[" << level << "] KILL " + << lemToKill << " BABY SEALS" << ends; lStrChanged = True; } } // lemDead != sealsDead @@ -2489,10 +2502,10 @@ -void AntiSeals::set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr) { - lTitleStr << "[" << level << "] KILL THE BABY SEALS"; +void AntiSeals::set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr) { + lTitleStr << "[" << level << "] KILL THE BABY SEALS" << ends; lStr << "[" << level << "] KILL "<< - (int)SCENARIO_SEALS_SEALS << " BABY SEALS"; + (int)SCENARIO_SEALS_SEALS << " BABY SEALS" << ends; } @@ -2539,7 +2552,7 @@ int KillTheFireDemon::new_level_check(int enemiesPlaying,WorldP,LocatorP locator, - int,Boolean &,stringstream &,Timer &, + int,Boolean &,ostrstream &,Timer &, IPhysicalManagerP) { if (enemiesPlaying == 0) { locator->arena_message_enq(Utils::strdup("Take That, You Mother-Fucking Spawn From Hell")); @@ -2559,12 +2572,12 @@ void KillTheFireDemon::new_level(int level,WorldP,LocatorP, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int) { manager->create_enemy(manager->enemy_physical(A_FireDemon)); - lTitleStr << "[" << level << "] FIRE DEMON"; - lStr << "[" << level << "] Kill the Fire Demon."; + lTitleStr << "[" << level << "] FIRE DEMON" << ends; + lStr << "[" << level << "] Kill the Fire Demon." << ends; } @@ -2581,7 +2594,7 @@ int KillTheDragon::new_level_check(int enemiesPlaying,WorldP,LocatorP locator, - int,Boolean &,stringstream &,Timer &, + int,Boolean &,ostrstream &,Timer &, IPhysicalManagerP) { if (enemiesPlaying == 0) { locator->arena_message_enq(Utils::strdup("The Infernal Worm has been vanquished")); @@ -2601,7 +2614,7 @@ void KillTheDragon::new_level(int level,WorldP w,LocatorP l, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int) { const PhysicalContext *cx = &Dragon::creatureContext.movingContext.physicalContext; Pos pos = w->empty_rect(cx->sizeMax); @@ -2615,8 +2628,8 @@ manager->create_enemy(p,False); } - lTitleStr << "[" << level << "] Dragon"; - lStr << "[" << level << "] Kill the Dragon."; + lTitleStr << "[" << level << "] Dragon" << ends; + lStr << "[" << level << "] Kill the Dragon." << ends; } @@ -2654,7 +2667,7 @@ int ZigZag::new_level_check(int,WorldP world,LocatorP locator, - int,Boolean &,stringstream &,Timer &, + int,Boolean &,ostrstream &,Timer &, IPhysicalManagerP) { PhysicalP xit = locator->lookup(xitId); assert(xit); // The Xit should never be destroyed. @@ -2667,7 +2680,7 @@ HumanP human = locator->get_human(n); if (human) { // previous depth - long depthOld = (long)human->get_data(); + int depthOld = (int)human->get_data(); Id id = human->get_id(); // Get physical for intelligence @@ -2684,9 +2697,9 @@ human->set_data((void *)depth); // Use 1-based counting for the User. - stringstream str; - str << "Depth " << (depth + 1); - locator->arena_message_enq(Utils::strdup(str.str().c_str()),p); + ostrstream str; + str << "Depth " << (depth + 1) << ends; + locator->arena_message_enq(str.str(),p); } } } @@ -2705,7 +2718,7 @@ void ZigZag::new_level(int level,WorldP world,LocatorP locator, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP,int) { Rooms worldRooms = world->get_rooms(); RoomIndex upperRight(0,worldRooms.acrossMax - 1); @@ -2718,8 +2731,9 @@ xitId = p->get_id(); // 1-based counting of depth for the user. - lTitleStr << "[" << level << "] ZIG-ZAG: Depth " << worldRooms.downMax; - lStr << "[" << level << "] ZIG-ZAG.\nFind the exit."; + lTitleStr << "[" << level << "] ZIG-ZAG: Depth " + << worldRooms.downMax << ends; + lStr << "[" << level << "] ZIG-ZAG.\nFind the exit." << ends; } @@ -2747,7 +2761,7 @@ int ThePound::new_level_check(int enemiesPlaying,WorldP,LocatorP locator, - int,Boolean &,stringstream &,Timer &, + int,Boolean &,ostrstream &,Timer &, IPhysicalManagerP) { if (enemiesPlaying == 0) { locator->arena_message_enq(Utils::strdup("Killed the Mutts")); @@ -2767,7 +2781,7 @@ void ThePound::new_level(int level,WorldP,LocatorP locator, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int) { locator->add_team(Scenarios::dog_team,NULL); @@ -2775,8 +2789,8 @@ manager->create_enemy(manager->enemy_physical(A_Dog)); } - lTitleStr << "[" << level << "] The Pound"; - lStr << "[" << level << "] The Pound"; + lTitleStr << "[" << level << "] The Pound" << ends; + lStr << "[" << level << "] The Pound" << ends; } @@ -2787,7 +2801,7 @@ int JapanTown::new_level_check(int enemiesPlaying,WorldP,LocatorP locator, - int,Boolean &,stringstream &,Timer &, + int,Boolean &,ostrstream &,Timer &, IPhysicalManagerP) { if (enemiesPlaying == 0) { locator->arena_message_enq(Utils::strdup("Damn Ninjas. Worse than roaches.")); @@ -2807,7 +2821,7 @@ void JapanTown::new_level(int level,WorldP,LocatorP locator, const DifficultyLevel &, - stringstream &lStr,stringstream &lTitleStr, + ostrstream &lStr,ostrstream &lTitleStr, IPhysicalManagerP manager,int) { locator->add_team(JapanTown::ninja_team,NULL); @@ -2815,8 +2829,8 @@ manager->create_enemy(manager->enemy_physical(A_Ninja)); } - lTitleStr << "[" << level << "] Japan-Town"; - lStr << "[" << level << "] Japan-Town"; + lTitleStr << "[" << level << "] Japan-Town" << ends; + lStr << "[" << level << "] Japan-Town" << ends; } diff -Nru xevil-2.02r2/cmn/game_style.h xevil-2.02r2/cmn/game_style.h --- xevil-2.02r2/cmn/game_style.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/game_style.h 2003-03-23 04:22:30.000000000 +0000 @@ -30,7 +30,12 @@ #endif #endif -#include +#if X11 +#include +#endif +#if WIN32 +#include +#endif #include "utils.h" #include "coord.h" @@ -39,8 +44,6 @@ #include "intel.h" -using namespace std; - #define SCENARIO_SEALS_TRAPDOORS 2 #define SCENARIO_BONUS_FROGS 12 #define SCENARIO_FLAG_FLAGS 15 @@ -88,7 +91,7 @@ virtual GameStyle *clone() = 0; - virtual void describe(stringstream &) = 0; + virtual void describe(ostrstream &) = 0; /* EFFECTS: Write a two-line description of the style to the stream. */ virtual GameStyleType get_type() = 0; @@ -134,7 +137,7 @@ virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, int level, - Boolean &lStrChanged,stringstream &levelStr, + Boolean &lStrChanged,ostrstream &levelStr, Timer &timer, IPhysicalManagerP); /* MODIFIES: lStrChanged */ @@ -163,7 +166,7 @@ virtual void new_level(int level,WorldP,LocatorP, const DifficultyLevel &dLevel, - stringstream &levelStr,stringstream &levelTitleStr, + ostrstream &levelStr,ostrstream &levelTitleStr, IPhysicalManagerP,int humansNum) = 0; /* MODIFIES: level */ /* EFFECTS: Start a new level. Use levelStr levelTitleStr to @@ -246,7 +249,7 @@ virtual GameStyleP clone(); - virtual void describe(stringstream &); + virtual void describe(ostrstream &); virtual GameStyleType get_type(); @@ -266,7 +269,7 @@ virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, int level,Boolean &lStrChanged, - stringstream &levelStr,Timer &timer, + ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual Boolean advance_level(); @@ -274,7 +277,7 @@ virtual Boolean award_bonus(); virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, - stringstream &levelStr,stringstream &levelTitleStr, + ostrstream &levelStr,ostrstream &levelTitleStr, IPhysicalManagerP,int humansNum); virtual void new_level_set_timer(Timer &timer); @@ -302,7 +305,7 @@ virtual GameStyleP clone(); - virtual void describe(stringstream &); + virtual void describe(ostrstream &); virtual GameStyleType get_type(); @@ -311,11 +314,11 @@ virtual void reset(WorldP,LocatorP,const DifficultyLevel &,int enemiesNumNext); virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, - stringstream &levelStr,stringstream &levelTitleStr, + ostrstream &levelStr,ostrstream &levelTitleStr, IPhysicalManagerP,int humansNum); virtual void new_level_set_timer(Timer &timer); @@ -337,7 +340,7 @@ virtual GameStyleP clone(); - virtual void describe(stringstream &); + virtual void describe(ostrstream &); virtual GameStyleType get_type(); @@ -352,7 +355,7 @@ virtual Boolean game_over_check(int humansPlaying,int enemiesPlaying); virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, - stringstream &levelStr,stringstream &levelTitleStr, + ostrstream &levelStr,ostrstream &levelTitleStr, IPhysicalManagerP,int humansNum); virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); @@ -373,7 +376,7 @@ virtual GameStyleP clone(); - virtual void describe(stringstream &); + virtual void describe(ostrstream &); virtual GameStyleType get_type(); @@ -386,7 +389,7 @@ virtual Boolean game_over_check(int humansPlaying,int enemiesPlaying); virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, - stringstream &levelStr,stringstream &levelTitleStr, + ostrstream &levelStr,ostrstream &levelTitleStr, IPhysicalManagerP,int humansNum); virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); @@ -405,7 +408,7 @@ virtual GameStyleP clone(); - virtual void describe(stringstream &); + virtual void describe(ostrstream &); virtual GameStyleType get_type(); @@ -420,7 +423,7 @@ virtual Boolean game_over_check(int humansPlaying,int enemiesPlaying); virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, - stringstream &levelStr,stringstream &levelTitleStr, + ostrstream &levelStr,ostrstream &levelTitleStr, IPhysicalManagerP,int humansNum); virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); @@ -439,7 +442,7 @@ virtual GameStyleP clone(); - virtual void describe(stringstream &); + virtual void describe(ostrstream &); virtual GameStyleType get_type(); @@ -448,7 +451,7 @@ virtual void reset(WorldP,LocatorP,const DifficultyLevel &dLevel,int); virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, - stringstream &levelStr,stringstream &levelTitleStr, + ostrstream &levelStr,ostrstream &levelTitleStr, IPhysicalManagerP,int humansNum); virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); @@ -463,7 +466,7 @@ virtual GameStyleP clone(); - virtual void describe(stringstream &); + virtual void describe(ostrstream &); virtual GameStyleType get_type(); @@ -482,7 +485,7 @@ virtual void reset(WorldP,LocatorP,const DifficultyLevel &,int enemiesNumNext); virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, - int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, IPhysicalManagerP); virtual Boolean advance_level(); @@ -490,7 +493,7 @@ virtual Boolean award_bonus(); virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, - stringstream &levelStr,stringstream &levelTitleStr, + ostrstream &levelStr,ostrstream &levelTitleStr, IPhysicalManagerP manager,int humansNum); virtual void new_level_set_timer(Timer &timer); diff -Nru xevil-2.02r2/cmn/intel.cpp xevil-2.02r2/cmn/intel.cpp --- xevil-2.02r2/cmn/intel.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/intel.cpp 2003-03-19 17:49:22.000000000 +0000 @@ -35,7 +35,7 @@ #include } #if X11 -#include +#include #endif #if WIN32 #include @@ -50,7 +50,6 @@ #include "xdata.h" -using namespace std; // Defines #define FIGHT_RANGE 40 // made it smaller for Dogs 45 // [50-40] @@ -213,7 +212,7 @@ -Intel::Intel(WorldP w,LocatorP l,const char *name, +Intel::Intel(WorldP w,LocatorP l,char *name, const IntelOptions *ops,ITmask opMask) { intelStatusChanged = True; living = True; @@ -756,7 +755,7 @@ -Human::Human(WorldP w,LocatorP l,const char *name,int lves, +Human::Human(WorldP w,LocatorP l,char *name,int lves, int *sharedLves,ColorNum cNum) : Intel(w,l,name,NULL,ITnone) { lives = lves; @@ -932,7 +931,7 @@ -Machine::Machine(WorldP w,LocatorP l,const char *name,const IntelOptions *ops, +Machine::Machine(WorldP w,LocatorP l,char *name,const IntelOptions *ops, ITmask opMask) : Intel(w,l,name,ops,opMask) { @@ -1830,7 +1829,7 @@ -Enemy::Enemy(WorldP w,LocatorP l,const char *name, +Enemy::Enemy(WorldP w,LocatorP l,char *name, const IntelOptions *ops,ITmask opMask) :Machine(w,l,name,ops,opMask) {} @@ -1855,7 +1854,7 @@ -Neutral::Neutral(WorldP w,LocatorP l,const char *name, +Neutral::Neutral(WorldP w,LocatorP l,char *name, const IntelOptions *ops,ITmask opMask) :Machine(w,l,name,ops,opMask) {} @@ -1868,7 +1867,7 @@ -SealIntel::SealIntel(WorldP w,LocatorP l,const char *name,const Id &home_id) +SealIntel::SealIntel(WorldP w,LocatorP l,char *name,const Id &home_id) :Neutral(w,l,name,NULL,ITnone) { // Timer oTimer(LADDER_JUMP_TIME); @@ -1907,7 +1906,7 @@ -DoppelIntel::DoppelIntel(WorldP w,LocatorP l,const char *name, +DoppelIntel::DoppelIntel(WorldP w,LocatorP l,char *name, const IntelOptions *ops,ITmask opMask,IntelP master) :Neutral(w,l,name,ops,opMask) { assert(master); @@ -2074,7 +2073,7 @@ -Pet::Pet(WorldP w,LocatorP l,const char *name, +Pet::Pet(WorldP w,LocatorP l,char *name, const IntelOptions *ops,ITmask opMask,IntelP master) :DoppelIntel(w,l,name,ops,opMask,master) { mode = Heel; @@ -2096,7 +2095,7 @@ char buffer[80]; ostrstream str(buffer,80); str << "mode changing from:" << Pet::mode_string(prev) << - " to: " << Pet::mode_string(curr) << endl; + " to: " << Pet::mode_string(curr) << endl << ends; #if WIN32 TRACE(buffer); #endif @@ -2309,7 +2308,7 @@ -const char *Pet::mode_string(int mode) { +char *Pet::mode_string(int mode) { switch (mode) { case Heel: return "Heel"; diff -Nru xevil-2.02r2/cmn/intel.h xevil-2.02r2/cmn/intel.h --- xevil-2.02r2/cmn/intel.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/intel.h 2000-01-19 20:54:10.000000000 +0000 @@ -123,7 +123,7 @@ // Class Definitions. class Intel { public: - Intel(WorldP w,LocatorP l,const char *name, + Intel(WorldP w,LocatorP l,char *name, const IntelOptions *ops,ITmask opMask); /* EFFECTS: Create a new intel with the options specified in opMakse that are in ops. ops will never be referenced if opMask is ITnone. lives now @@ -293,7 +293,7 @@ // Simply buffers input from a user interface. class Human: public Intel { public: - Human(WorldP w,LocatorP l,const char *name,int lives, + Human(WorldP w,LocatorP l,char *name,int lives, int *sharedLives,ColorNum colorNum); /* NOTE: Uses all default options. intelOptions should be meaningless for a human. If "sharedLives" is non-null, ignore "lives" and share the lives. */ @@ -346,7 +346,7 @@ class Machine: public Intel { public: - Machine(WorldP w,LocatorP l,const char *name, + Machine(WorldP w,LocatorP l,char *name, const IntelOptions *ops,ITmask opMask); virtual IntelId get_master_intel_id(); @@ -464,7 +464,7 @@ class Enemy: public Machine { public: - Enemy(WorldP w,LocatorP l,const char *name, + Enemy(WorldP w,LocatorP l,char *name, const IntelOptions *ops,ITmask opMask); static void set_reflexes_time(int time) {reflexesTime = time;} @@ -491,7 +491,7 @@ class Neutral: public Machine { public: - Neutral(WorldP w,LocatorP l,const char *name, + Neutral(WorldP w,LocatorP l,char *name, const IntelOptions *ops,ITmask opMask); virtual Boolean is_enemy(); @@ -502,7 +502,7 @@ class SealIntel: public Neutral { public: - SealIntel(WorldP w,LocatorP l,const char *name,const Id &homeId); + SealIntel(WorldP w,LocatorP l,char *name,const Id &homeId); virtual Boolean is_seal_intel(); @@ -522,7 +522,7 @@ class DoppelIntel: public Neutral { public: - DoppelIntel(WorldP w,LocatorP l,const char *name, + DoppelIntel(WorldP w,LocatorP l,char *name, const IntelOptions *ops,ITmask opMask, IntelP master = NULL); @@ -572,7 +572,7 @@ // in choose_strategy() and go_get_em(). class Pet: public DoppelIntel { public: - Pet(WorldP w,LocatorP l,const char *name, + Pet(WorldP w,LocatorP l,char *name, const IntelOptions *ops,ITmask opMask, IntelP master = NULL); @@ -583,7 +583,7 @@ IT_WEAPON_{some dir}, or to come back to him if command is IT_WEAPON_CENTER. This will also set p to be the new master. */ - static const char *mode_string(int mode); + static char *mode_string(int mode); /* NOTE: For debugging. */ diff -Nru xevil-2.02r2/cmn/locator.cpp xevil-2.02r2/cmn/locator.cpp --- xevil-2.02r2/cmn/locator.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/locator.cpp 2003-03-23 04:41:36.000000000 +0000 @@ -50,7 +50,6 @@ #include "bitmaps/locator/locator.bitmaps" // for arrows -using namespace std; // When we reach this, start deleting objects. #define OL_LIST_WARN ((int)(OL_LIST_MAX * 0.9)) diff -Nru xevil-2.02r2/cmn/locator.h xevil-2.02r2/cmn/locator.h --- xevil-2.02r2/cmn/locator.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/locator.h 2003-03-23 04:35:30.000000000 +0000 @@ -47,7 +47,7 @@ // Include Files -#include +#include #include "utils.h" #include "coord.h" @@ -96,8 +96,6 @@ #define OL_RECENT_SOUNDS_MAX 30 -class OLgridEntry; -class OLshadowEntry; // An entry for one object in the list of all objects currently in the game. class OLentry { diff -Nru xevil-2.02r2/cmn/physical.cpp xevil-2.02r2/cmn/physical.cpp --- xevil-2.02r2/cmn/physical.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/physical.cpp 2000-01-20 04:38:14.000000000 +0000 @@ -33,10 +33,10 @@ // Include Files #include "xdata.h" #include "physical.h" -#include +#include #if X11 -#include +#include #endif #if WIN32 #include @@ -54,7 +54,6 @@ #include "bitmaps/transform/transform.bitmaps" -using namespace std; // Defines #define VEL_SMALL 1 @@ -524,9 +523,9 @@ if (heat == 0 && heatNext > 0) { LocatorP l = get_locator(); - stringstream str; - str << get_class_name() << " is on fire."; - locator->message_enq(Utils::strdup(str.str().c_str())); + ostrstream str; + str << get_class_name() << " is on fire." << ends; + locator->message_enq(str.str()); } } previousHeatWasSecondary = secondary; @@ -1845,7 +1844,7 @@ } // Use the pixmap resource id as the base. - u_int cmnBitsId = (unsigned long)mc->pixmapBits[baseDir][animNum]; + u_int cmnBitsId = (unsigned int)mc->pixmapBits[baseDir][animNum]; // It is ok to call OneTransform::compute_key() even if there is no // transformation, will just return 0x0. @@ -2557,17 +2556,17 @@ void Item::die() { LocatorP locator = get_locator(); - stringstream msg; + ostrstream msg; switch (dieMessage) { case NONE: break; case USED: - msg << get_class_name() << " has been used."; - locator->message_enq(Utils::strdup(msg.str().c_str())); + msg << get_class_name() << " has been used." << ends; + locator->message_enq(msg.str()); break; case DESTROYED: - msg << get_class_name() << " is destroyed."; - locator->message_enq(Utils::strdup(msg.str().c_str())); + msg << get_class_name() << " is destroyed." << ends; + locator->message_enq(msg.str()); break; }; @@ -2651,8 +2650,10 @@ // Prevent non-biologicals from picking up drugs. if (p->is_creature() && !((CreatureP)p)->biological()) { + ostrstream msg; + msg << "Non-Biological Creatures Cannot Use Drugs" << ends; LocatorP locator = get_locator(); - locator->arena_message_enq(Utils::strdup("Non-Biological Creatures Cannot Use Drugs"), p); + locator->arena_message_enq(msg.str(),p); kill_self(); } else { @@ -2672,11 +2673,13 @@ assert(context->odChance >= 0); if (context->odChance && Utils::choose(context->odChance) == 0) { p->kill_self(); - stringstream msg; - msg << p->get_class_name() << " dies from crack overdose."; - locator->message_enq(Utils::strdup(msg.str().c_str())); + ostrstream msg; + msg << p->get_class_name() << " dies from crack overdose." << ends; + locator->message_enq(msg.str()); - locator->arena_message_enq(Utils::strdup("You Died From Drug Overdose"),p); + ostrstream arenaMsg; + arenaMsg << "You Died From Drug Overdose" << ends; + locator->arena_message_enq(arenaMsg.str(),p); set_quiet_death(); // so doesn't report "has been used" message. } @@ -2690,7 +2693,9 @@ } else { // Shouldn't get here, should kill self when picking it up. - locator->arena_message_enq(Utils::strdup("Non-Biological Creatures Cannot Use Drugs"),p); + ostrstream msg; + msg << "Non-Biological Creatures Cannot Use Drugs" << ends; + locator->arena_message_enq(msg.str(),p); } kill_self(); @@ -4329,14 +4334,14 @@ if (!get_quiet_death() && !alive() && (corpseTimer.ready() || (get_health() < - cc->corpseHealth))) { LocatorP locator = get_locator(); - stringstream msg; + ostrstream msg; if (corpseTimer.ready()) { - msg << get_class_name() << " corpse has decomposed."; - locator->message_enq(Utils::strdup(msg.str().c_str())); + msg << get_class_name() << " corpse has decomposed." << ends; + locator->message_enq(msg.str()); } else { - msg << get_class_name() << " corpse has been destroyed."; - locator->message_enq(Utils::strdup(msg.str().c_str())); + msg << get_class_name() << " corpse has been destroyed." << ends; + locator->message_enq(msg.str()); } set_delete_me(); } @@ -4394,9 +4399,9 @@ set_vel_next(velNew); set_stance_next(CO_air); - stringstream msg; - msg << get_class_name() << " has died."; - locator->message_enq(Utils::strdup(msg.str().c_str())); + ostrstream msg; + msg << get_class_name() << " has died." << ends; + locator->message_enq(msg.str()); set_no_death_delete(); } @@ -6067,10 +6072,10 @@ } // If User is already holding the max number of weapons. else if (weaponsNum >= PH_WEAPONS_MAX) { - stringstream msg; - msg << "Can only hold " << PH_WEAPONS_MAX << " weapons"; + ostrstream msg; + msg << "Can only hold " << PH_WEAPONS_MAX << " weapons" << ends; LocatorP locator = cre->get_locator(); - locator->arena_message_enq(Utils::strdup(msg.str().c_str()),cre); + locator->arena_message_enq(msg.str(),cre); destroyOther = True; } // Actually pick it up. @@ -6119,14 +6124,15 @@ else { LocatorP locator = cre->get_locator(); if (itemsNum == PH_ITEMS_MAX) { - stringstream msg; - msg << "Can only hold " << PH_ITEMS_MAX << " items"; - locator->arena_message_enq(Utils::strdup(msg.str().c_str()),cre); + ostrstream msg; + msg << "Can only hold " << PH_ITEMS_MAX << " items" << ends; + locator->arena_message_enq(msg.str(),cre); } else if (itemClassCount >= ITEM_CLASS_MAX) { - stringstream msg; - msg << "Can only hold " << ITEM_CLASS_MAX << " of any one item"; - locator->arena_message_enq(Utils::strdup(msg.str().c_str()),cre); + ostrstream msg; + msg << "Can only hold " << ITEM_CLASS_MAX + << " of any one item" << ends; + locator->arena_message_enq(msg.str(),cre); } other->set_quiet_death(); @@ -6655,9 +6661,9 @@ ((ItemP)p)->use(cre); } else { - stringstream str; - str << "Cannot use " << p->get_class_name(); - locator->arena_message_enq(Utils::strdup(str.str().c_str()),cre); + ostrstream str; + str << "Cannot use " << p->get_class_name() << ends; + locator->arena_message_enq(str.str(),cre); } } break; diff -Nru xevil-2.02r2/cmn/physical.h xevil-2.02r2/cmn/physical.h --- xevil-2.02r2/cmn/physical.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/physical.h 2000-01-19 20:54:08.000000000 +0000 @@ -93,7 +93,7 @@ CLASSNAME::CLASSNAME(InStreamP in,const CLASSNAME ## Context &cx, \ CLASSNAME ## Xdata &x_data, \ WorldP w,LocatorP l) \ - : PARENT(in,cx. parent ## Context,x_data,w,l) + : PARENT(in,cx. ## parent ## Context,x_data,w,l) // Used by internal nodes and leaves. #define DEFINE_UPDATE_FROM_STREAM(CLASSNAME,PARENT) \ diff -Nru xevil-2.02r2/cmn/role.cpp xevil-2.02r2/cmn/role.cpp --- xevil-2.02r2/cmn/role.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/role.cpp 2000-01-19 20:54:34.000000000 +0000 @@ -29,9 +29,9 @@ #include "stdafx.h" -#include +#include #if X11 -#include +#include #include #endif #if WIN32 @@ -266,39 +266,43 @@ void Role::error(const char *msg1,const char *msg2,const char *msg3) { - stringstream str; + ostrstream str; if (msg2 == NULL) { - str << msg1; + str << msg1 << ends; } else if (msg3 == NULL) { - str << msg1 << msg2; + str << msg1 << msg2 << ends; } else { - str << msg1 << msg2 << msg3; + str << msg1 << msg2 << msg3 << ends; } // Call one argument version. - _error(str.str().c_str()); + _error(str.str()); + + delete str.str(); } void Role::message(const char *msg1,const char *msg2,const char *msg3) { - stringstream str; + ostrstream str; if (msg2 == NULL) { - str << msg1; + str << msg1 << ends; } else if (msg3 == NULL) { - str << msg1 << msg2; + str << msg1 << msg2 << ends; } else { - str << msg1 << msg2 << msg3; + str << msg1 << msg2 << msg3 << ends; } // Call one argument version. - _message(str.str().c_str()); + _message(str.str()); + + delete str.str(); } @@ -601,11 +605,11 @@ // Display message that we are looking up IP address. // Assumes that caller will call Client::connect_server after a turn or two, // so the message will be displayed on the Ui. - stringstream str; - str << "Looking up IP address for server " << serverName; + ostrstream str; + str << "Looking up IP address for server " << serverName << ends; // Display for a long time. - errLocator->arena_message_enq(Utils::strdup(str.str().c_str()),NULL,1000000); - errLocator->message_enq(Utils::strdup(str.str().c_str())); + errLocator->arena_message_enq(str.str(),NULL,1000000); + errLocator->message_enq(Utils::strdup(str.str())); // Probably would be better to use Role::message(), but we want it to stay // up for a long time. Should add argument to Role::message(). @@ -659,10 +663,12 @@ } } if (n == CLIENT_PORT_TRIES) { - stringstream str; + ostrstream str; str << "Could not bind local UDP port to any of " - << clientPortBase << "-" << (clientPortBase + CLIENT_PORT_TRIES - 1); - error(str.str().c_str()); + << clientPortBase << "-" << (clientPortBase + CLIENT_PORT_TRIES - 1) + << ends; + error(str.str()); + delete str.str(); return; } // cout << "UDP port seems to be" << client.sin_port << endl; @@ -697,19 +703,22 @@ // Inform user of failed connection if (!ok()) { - stringstream msg; + strstream msg; msg << "Could not connect to " << serverName << " on port " << - port << "."; - error(msg.str().c_str()); + port << "." << ends; + error(msg.str()); + delete(msg.str()); delete tcpOut; return; } // Inform user of successful connection - stringstream msg; + strstream msg; msg << hostName << " connected to " << serverName << " on port " << - port; - message(msg.str().c_str()); + port << ends; + message(msg.str()); + delete msg.str(); + // Create TCP and UDP streams. tcpIn = new NetInStream(tcpSock,False); @@ -958,11 +967,11 @@ Role::_error(msg); if (errorLocator) { - stringstream str2; - str2 << "ERROR: " << msg; - errorLocator->arena_message_enq(Utils::strdup(str2.str().c_str()),NULL,ROLE_FAILED_TIME); + ostrstream str2; + str2 << "ERROR: " << msg << ends; + errorLocator->arena_message_enq(str2.str(),NULL,ROLE_FAILED_TIME); // Don't delete str2.str(), give memory to the Locator. - errorLocator->message_enq(Utils::strdup(str2.str().c_str())); + errorLocator->message_enq(Utils::strdup(str2.str())); } #if WIN32 // Only the client can afford to block on error messages. @@ -977,9 +986,11 @@ Role::_error(msg); if (errorLocator) { - errorLocator->arena_message_enq(Utils::strdup(msg)); + ostrstream str2; + str2 << msg << ends; + errorLocator->arena_message_enq(str2.str()); // Don't delete str2.str(), give memory to the Locator. - errorLocator->message_enq(Utils::strdup(msg)); + errorLocator->message_enq(Utils::strdup(str2.str())); } } @@ -1245,9 +1256,10 @@ if (turn > turnMax) { turnMax = turn; if (echoPingPong) { - stringstream str; - str << "PONG the server with turn " << turnMax; - message(str.str().c_str()); + ostrstream str; + str << "PONG the server with turn " << turnMax << ends; + message(str.str()); + delete str.str(); } // Tell server so it can free turn windows to send more data. XETP::send_pong(udpOut,turnMax); @@ -1353,9 +1365,10 @@ } } else { - stringstream str; - str << "No context for classId " << classId; - error(str.str().c_str()); + ostrstream str; + str << "No context for classId " << classId << ends; + error(str.str()); + delete str.str(); } } } @@ -1569,9 +1582,9 @@ return Utils::strdup(clientName); } - stringstream str; - str << '\"' << intel->get_name() << "\"@" << clientName; - return Utils::strdup(str.str().c_str()); + ostrstream str; + str << '\"' << intel->get_name() << "\"@" << clientName << ends; + return str.str(); } @@ -1682,10 +1695,11 @@ } #ifdef SKIP_MESSAGES - stringstream msg; + ostrstream msg; msg << "Average delay is " << avg << " out of " - << delaysNum << " samples."; + << delaysNum << " samples." << ends; server->message(msg.str()); + delete msg.str(); #endif #if 0 @@ -1709,9 +1723,10 @@ // server->error("Client has reached maximum skip value."); // } #ifdef SKIP_MESSAGES - stringstream msg; - msg << "Increasing skip to " << skip; + ostrstream msg; + msg << "Increasing skip to " << skip << ends; server->message(msg.str()); + delete msg.str(); #endif } // We have moved back into our target range, can send more data now. @@ -1719,9 +1734,10 @@ skip--; #ifdef SKIP_MESSAGES - stringstream msg; - msg << "Decreasing skip to " << skip; + ostrstream msg; + msg << "Decreasing skip to " << skip << ends; server->message(msg.str()); + delete msg.str(); #endif } @@ -1761,7 +1777,7 @@ -Server::Server(Boolean lHuman,const char *portName,LocatorP errLocator) { +Server::Server(Boolean lHuman,char *portName,LocatorP errLocator) { // Hack, using errLocator for more than reporting errors. errLocator->set_remember_deleted(True); errLocator->set_remember_sounds(True); @@ -1827,17 +1843,19 @@ // Give address to both the TCP and UDP sockets. if (bind(tcpSock, (CMN_SOCKADDR *)&serverAddr, sizeof(serverAddr)) < 0) { - stringstream str; + ostrstream str; str << "Couldn't bind socket name to TCP socket on port " - << port << "."; - error(str.str().c_str()); + << port << "." << ends; + error(str.str()); + delete str.str(); return; } if (bind(udpSock, (CMN_SOCKADDR *)&serverAddr, sizeof(serverAddr)) < 0) { - stringstream str; + ostrstream str; str << "Couldn't bind socket name to UDP socket on port " - << port << "."; - error(str.str().c_str()); + << port << "." << ends; + error(str.str()); + delete str.str(); return; } @@ -1850,9 +1868,10 @@ assert(udpIn); // Message to server log. - stringstream msg; - msg << "Set up server on port " << port; - message(msg.str().c_str()); + strstream msg; + msg << "Set up server on port " << port << ends; + message(msg.str()); + delete(msg.str()); running = True; } @@ -1932,9 +1951,10 @@ localHumanId = hId; // Log the human's name. - stringstream msg; - msg << "Player 0 \"" << human->get_name() << '\"' << "@SERVER"; - message(msg.str().c_str()); + strstream msg; + msg << "Player 0 \"" << human->get_name() << '\"' << "@SERVER" << ends; + message(msg.str()); + delete(msg.str()); return; } @@ -1965,11 +1985,12 @@ // Log all the players in the game, some code duplication for the // local human. - stringstream str; + ostrstream str; char* fullName = cn->get_full_client_name(); - str << "Player " << num << " " << fullName; - message(str.str().c_str()); + str << "Player " << num << " " << fullName << ends; + message(str.str()); delete fullName; + delete str.str(); // Send assign_intel via TCP OutStreamP out = cn->get_tcp_out_stream(); @@ -1986,12 +2007,13 @@ // anyway. for (m = 0; m < connections.length() && m != n; m++) { char* fullName = cn->get_full_client_name(); - stringstream str; - str << fullName << " has joined the game"; + ostrstream str; + str << fullName << " has joined the game" << ends; delete fullName; OutStreamP out = cn->get_udp_out_stream(); - XETP::send_arena_message(out,timeMS,str.str().c_str()); + XETP::send_arena_message(out,timeMS,str.str()); + delete str.str(); } cn->creation_message_sent(); } @@ -2079,12 +2101,13 @@ // Give the connection some slack when it is first starting up. turn - cn->get_start_turn() >= MINIMUM_CUTOFF) { char* fullName = cn->get_full_client_name(); - stringstream str; + ostrstream str; str << fullName << " has not responded in " - << diff << " turns. Disconnect."; - message(str.str().c_str()); + << diff << " turns. Disconnect." << ends; + message(str.str()); delete fullName; + delete str.str(); tooOld = True; } } @@ -2124,10 +2147,11 @@ diff == NO_ACTIVITY_WARN_2 || diff == NO_ACTIVITY_WARN_3) { if (echoPingPong) { - stringstream str; + ostrstream str; str << "Haven't heard from " << cn->get_client_name() - << " in " << diff << " turns, sending PING."; - message(str.str().c_str()); + << " in " << diff << " turns, sending PING." << ends; + message(str.str()); + delete str.str(); } XETP::send_ping(cn->get_udp_out_stream()); } @@ -2287,11 +2311,7 @@ for (m = 0; m < followers.length(); m++) { PhysicalP q = (PhysicalP)followers.get(m); netData = q->get_net_data(); - // This line was aborting network games, often in the pound scenario. - // Without it, the server seems to continue without error. - // I tried replacing it with a warning, but there is so much of it - // that it is nearly impossible to see anything else. -Brandon -// assert(!netData->get_sent_flag()); + assert(!netData->get_sent_flag()); netData->set_sent_flag(True); } @@ -2693,9 +2713,9 @@ // Careful to set the propagate flag to False so the message doesn't get // sent to the clients. if (errorLocator) { - stringstream str2; - str2 << "SERVER: " << msg; - errorLocator->arena_message_enq(Utils::strdup(str2.str().c_str()),NULL,ROLE_FAILED_TIME,False); + ostrstream str2; + str2 << "SERVER: " << msg << ends; + errorLocator->arena_message_enq(str2.str(),NULL,ROLE_FAILED_TIME,False); // Don't delete str2.str(), give memory to the Locator. // Could do a regular message_enq(), but would have to deal with the @@ -2708,9 +2728,10 @@ void Server::display_chat_message(LocatorP l,const char* sender, const char* msg) { // Log the chat message, then let Role handle it. - stringstream logMsg; - logMsg << '<' << sender << '>' << msg; - message(logMsg.str().c_str()); + strstream logMsg; + logMsg << '<' << sender << '>' << msg << ends; + message(logMsg.str()); + delete logMsg.str(); Role::display_chat_message(l,sender,msg); } @@ -2830,11 +2851,12 @@ udpAddr->sin_port = htons(udpPort); // Log the connection. - stringstream msg; + strstream msg; msg << clientName << " connected (TCP port " << ntohs(tcpAddr.sin_port) << - ", UDP port " << udpPort << ")"; - message(msg.str().c_str()); + ", UDP port " << udpPort << ")" << ends; + message(msg.str()); + delete(msg.str()); Connection* cn = new Connection(this,errorLocator, @@ -2852,7 +2874,7 @@ XETP::send_reset(out,manager->get_game_style_type()); // Say hello to the new client. - stringstream greeting; + ostrstream greeting; greeting << "Welcome to " << hostName << "."; if (get_humans_num() == 1) { @@ -2862,8 +2884,10 @@ greeting << " There are now " << get_humans_num() << " players."; } + greeting << ends; int timeMS = quantaToMS(UI_ARENA_MESSAGE_TIME,manager); - XETP::send_arena_message(out,timeMS,greeting.str().c_str()); + XETP::send_arena_message(out,timeMS,greeting.str()); + delete greeting.str(); manager->humans_num_incremented(); } @@ -2894,16 +2918,18 @@ Connection* cm = get_connection(m); char* fullName = cn->get_full_client_name(); - stringstream str; + ostrstream str; str << fullName << " has disconnected"; if (intel) { str << ", " << kills << " human kills"; } + str << ends; XETP::send_arena_message(cm->get_udp_out_stream(), - timeMS,str.str().c_str()); + timeMS,str.str()); delete fullName; + delete str.str(); } } @@ -3236,8 +3262,8 @@ void Server::send_udp_server_pong(IGameManager* manager,LocatorP locator, CMN_SOCKET udpSock, CMN_SOCKADDR_IN* destAddr) { - static const char* unknownString = ""; - static const char* serverString = ""; + static char* unknownString = ""; + static char* serverString = ""; // Temporary stream. diff -Nru xevil-2.02r2/cmn/role.h xevil-2.02r2/cmn/role.h --- xevil-2.02r2/cmn/role.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/role.h 2000-01-19 20:54:08.000000000 +0000 @@ -539,7 +539,7 @@ public: - Server(Boolean localHuman,const char *portName,LocatorP); + Server(Boolean localHuman,char *portName,LocatorP); /* EFFECTS: Create a server that listens for connections on given port. If NULL is passed in, use XETP::DEFAULT_PORT. */ diff -Nru xevil-2.02r2/cmn/streams.cpp xevil-2.02r2/cmn/streams.cpp --- xevil-2.02r2/cmn/streams.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/streams.cpp 2000-01-19 20:54:32.000000000 +0000 @@ -31,13 +31,12 @@ #include "utils.h" #include "neth.h" // needed for recv, send, recvfrom, sendto -#include +#include #include "streams.h" #include "xetp.h" // yuck, need this for XETP::versionStr -using namespace std; Checksum GenericStream::compute_checksum(u_char *data,int len) { Checksum c = 0; @@ -206,7 +205,7 @@ -Boolean NetOutStream::write(const void *buf,int size) { +Boolean NetOutStream::write(void *buf,int size) { if (!isAlive) { return False; } @@ -519,7 +518,7 @@ -Boolean UDPOutStream::write(const void *buf,int size) { +Boolean UDPOutStream::write(void *buf,int size) { if (!isAlive) { return False; } diff -Nru xevil-2.02r2/cmn/streams.h xevil-2.02r2/cmn/streams.h --- xevil-2.02r2/cmn/streams.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/streams.h 2000-01-19 20:54:06.000000000 +0000 @@ -97,7 +97,7 @@ public: OutStream(Boolean ownSock) : GenericStream(ownSock) {} - virtual Boolean write(const void *buf,int size) = 0; + virtual Boolean write(void *buf,int size) = 0; /* EFFECTS: Write size number of bytes into buf. Return True if successful. */ @@ -171,7 +171,7 @@ virtual Boolean alive(); - virtual Boolean write(const void *buf,int size); + virtual Boolean write(void *buf,int size); virtual void write_char(u_char); @@ -253,7 +253,7 @@ virtual void done_packet(); - virtual Boolean write(const void *buf,int size); + virtual Boolean write(void *buf,int size); void flush(); diff -Nru xevil-2.02r2/cmn/utils.cpp xevil-2.02r2/cmn/utils.cpp --- xevil-2.02r2/cmn/utils.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/utils.cpp 2003-03-19 18:05:12.000000000 +0000 @@ -30,16 +30,16 @@ // Include Files #include "stdafx.h" -#include +#include #include #include #include -#include +#include #if WIN32 #include #endif #if X11 -#include +#include #endif #ifdef WIN32 @@ -422,8 +422,10 @@ char* Utils::get_OS_info() { + ostrstream ret; + + #ifdef WIN32 - stringstream ret; OSVERSIONINFO osInfo; osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); Boolean set = False; @@ -463,11 +465,12 @@ Utils::strcmp(osInfo.szCSDVersion," ")) { ret << '(' << osInfo.szCSDVersion << ')'; } + ret << ends; } } if (!set) { - ret << "Unknown Win32"; + ret << "Unknown Win32" << ends; } #endif @@ -491,15 +494,20 @@ if (buffer[strLen - 1] == '\n') { buffer[strLen - 1] = '\0'; } - return strdup(buffer); + ret << buffer << ends; + set = True; } } pclose(fp); } - return strdup("Unknown UNIX"); + if (!set) { + ret << "Unknown UNIX" << ends; + } #endif + + return ret.str(); } @@ -597,7 +605,7 @@ // Not tested. out->write_int(len); for (int n = 0; n < len; n++) { - out->write_int((long)data[n]); + out->write_int((int)data[n]); } } @@ -753,7 +761,7 @@ private: - Bucket* _get(int &index,void* key); + Bucket* HashTable::_get(int &index,void* key); /* MODIFIES: index */ /* EFFECTS: Internal helper function. Return the Bucket containing key or NULL if not found. Set index to the bucket list for key whether @@ -936,7 +944,7 @@ // Pretty crappy hash function, I know. // Careful if bucketsNum is a power of 2. int HashTable::defaultHash(void* key,int bucketsNum) { - return ((unsigned long)key) % bucketsNum; + return ((unsigned int)key) % bucketsNum; } @@ -1016,7 +1024,7 @@ #endif #if X11 - std::cout << str << std::endl; + cout << str << endl; #endif } diff -Nru xevil-2.02r2/cmn/utils.h xevil-2.02r2/cmn/utils.h --- xevil-2.02r2/cmn/utils.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/utils.h 2003-03-19 18:03:50.000000000 +0000 @@ -98,11 +98,11 @@ #define MSEC_PER_CLOCK (1.0e3 / CLOCKS_PER_SEC) #endif -#ifndef MAX -#define MAX(a,b) (ab ? b : a) +#ifndef min +#define min(a,b) (a>b ? b : a) #endif #if X11 @@ -159,7 +159,7 @@ typedef int GameStyleType; // Possible values of GameStyleType. -enum {SCENARIOS,LEVELS_ONLY,KILL,DUEL,EXTENDED,TRAINING,LEVELS,NUM_GAME_STYLES}; +enum {SCENARIOS,LEVELS_ONLY,KILL,DUEL,EXTENDED,TRAINING,LEVELS}; @@ -237,13 +237,13 @@ /* EFFECTS: Wrapper for C library strcmp(). Return 0 if strings are the same. */ - static const char* strchr(const char* cs,int c) + static char* strchr(const char* cs,int c) {return ::strchr(cs,c);} - static const char* strrchr(const char* cs,int c) + static char* strrchr(const char* cs,int c) {return ::strrchr(cs,c);} - static const char* strstr(const char* cs,const char* ct) + static char* strstr(const char* cs,const char* ct) {return ::strstr(cs,ct);} static void strcpy(char* s,const char* ct) diff -Nru xevil-2.02r2/cmn/world.cpp xevil-2.02r2/cmn/world.cpp --- xevil-2.02r2/cmn/world.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/world.cpp 2000-01-20 05:15:08.000000000 +0000 @@ -35,7 +35,7 @@ #endif // Include Files. -#include +#include #include "utils.h" #include "coord.h" @@ -48,7 +48,6 @@ // For PhysMover. #include "actual.h" -using namespace std; // Defines. #define HANGING_PERCENT 0.40 // The % of the edge hanging off the corner. diff -Nru xevil-2.02r2/cmn/xetp_basic.cpp xevil-2.02r2/cmn/xetp_basic.cpp --- xevil-2.02r2/cmn/xetp_basic.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/xetp_basic.cpp 2000-01-19 20:54:30.000000000 +0000 @@ -33,7 +33,7 @@ #include "xetp_basic.h" -const char *XETPBasic::versionStr = "XETP1.00"; +char *XETPBasic::versionStr = "XETP1.00"; // 0.10 released with special RedHat version // 0.12 for 2.0b5 // 0.15 for 2.0b6 diff -Nru xevil-2.02r2/cmn/xetp_basic.h xevil-2.02r2/cmn/xetp_basic.h --- xevil-2.02r2/cmn/xetp_basic.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/xetp_basic.h 2000-01-19 20:54:04.000000000 +0000 @@ -52,7 +52,7 @@ // All values are big-endian enum {HEADER_LENGTH = 3}; // 8 enum {VERSION_LENGTH = 8}; // streams.h depends on this value. - static const char *versionStr; + static char *versionStr; // The ':' syntax gives the size in bytes of each component. :String means // use Utils::string_read(), Utils::string_write(), etc. diff -Nru xevil-2.02r2/cmn/xetp.cpp xevil-2.02r2/cmn/xetp.cpp --- xevil-2.02r2/cmn/xetp.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/xetp.cpp 2000-01-19 20:54:30.000000000 +0000 @@ -29,9 +29,9 @@ #include "stdafx.h" -#include +#include #if X11 -#include +#include #endif #if WIN32 #include @@ -53,8 +53,6 @@ #include "xetp.h" -using namespace std; - void XETP::check_sizes() { XETPBasic::check_sizes(); @@ -161,7 +159,7 @@ for (n = 0; n < physicals.length(); n++) { PhysicalP p = (PhysicalP)physicals.get(n); // computing object_length twice, but who cares. - _send_object(out,p,turn,(long)tickTypes.get(n), + _send_object(out,p,turn,(TickType)tickTypes.get(n), compute_object_length(p)); } @@ -276,7 +274,7 @@ -void XETP::send_message(OutStreamP out,const char *msg) { +void XETP::send_message(OutStreamP out,char *msg) { assert(msg); u_int len = strlen(msg); @@ -295,7 +293,7 @@ -void XETP::send_arena_message(OutStreamP out,int time,const char *msg) { +void XETP::send_arena_message(OutStreamP out,int time,char *msg) { assert(msg); u_int len = sizeof(int) + // time strlen(msg); // string body diff -Nru xevil-2.02r2/cmn/xetp.h xevil-2.02r2/cmn/xetp.h --- xevil-2.02r2/cmn/xetp.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/cmn/xetp.h 2000-01-19 20:54:04.000000000 +0000 @@ -83,9 +83,9 @@ static void send_rooms_known(OutStreamP,const Rooms &, int worldVersion,Boolean *map); - static void send_message(OutStreamP,const char *msg); + static void send_message(OutStreamP,char *msg); - static void send_arena_message(OutStreamP,int timeMS,const char *msg); + static void send_arena_message(OutStreamP,int timeMS,char *msg); static void send_command(OutStreamP,const IntelId &,ITcommand); diff -Nru xevil-2.02r2/config.mk xevil-2.02r2/config.mk --- xevil-2.02r2/config.mk 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/config.mk 2003-03-23 08:08:58.000000000 +0000 @@ -83,10 +83,7 @@ #### Attempt to guesss the host architecture using the HOSTYPE and hostype # variables. Then call self with the architecture name. default: -# FORCEHOSTTYPE is used by debian-linux - @if [ $${FORCEHOSTTYPE-bob} != bob ]; then \ - archit=$$FORCEHOSTTYPE; \ - elif [ $${HOSTTYPE-bob} != bob ] ; then \ + @if [ $${HOSTTYPE-bob} != bob ] ; then \ archit=$$HOSTTYPE ; \ elif [ $${hosttype-bob} != bob ] ; then \ archit=$$hosttype ; \ @@ -255,15 +252,6 @@ OBJ_DIR=$(DEPTH)/x11/REDHAT_LINUX PCKG_NAME="redhatlinux" \ $(TARGETS) -#For debian-linux -debian-linux: - @$(MAKE) CC="g++" \ -CFLAGS="-DUSE_RANDOM -DXEVIL_KEYSET=UIlinux -DUSE_UINT_NET_LENGTH" \ -INCL_DIRS="-I/usr/X11R6/include" \ -LIBS_DIRS="-L/usr/X11R6/lib" \ -LIBS="-lXpm -lX11 -lm" \ -$(TARGETS) - # use static # Should add -DXEVIL_KEYSET=UIlinux i386-linux-old: diff -Nru xevil-2.02r2/debian/changelog xevil-2.02r2/debian/changelog --- xevil-2.02r2/debian/changelog 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/debian/changelog 2022-01-12 13:15:35.000000000 +0000 @@ -1,3 +1,15 @@ +xevil (2.02r2-10.2) unstable; urgency=low + + * Non-maintainer upload. + * Change debhelper compat from 5 to 11. (Closes: #965893) + - Update debian/rules. (Closes: #998982) + - Clean files by debian/clean + * Change source package to DebSrc3.0 with quilt. + - Split diff.gz to quilt patches. + * debian/copyright: Change to dep5 machine-readable format. + + -- Ying-Chun Liu (PaulLiu) Wed, 12 Jan 2022 21:15:35 +0800 + xevil (2.02r2-10.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru xevil-2.02r2/debian/clean xevil-2.02r2/debian/clean --- xevil-2.02r2/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ xevil-2.02r2/debian/clean 2022-01-12 13:15:35.000000000 +0000 @@ -0,0 +1 @@ +x11/bitmaps/ui/xevil.xpm diff -Nru xevil-2.02r2/debian/compat xevil-2.02r2/debian/compat --- xevil-2.02r2/debian/compat 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/debian/compat 2022-01-12 13:15:35.000000000 +0000 @@ -1 +1 @@ -5 +11 diff -Nru xevil-2.02r2/debian/control xevil-2.02r2/debian/control --- xevil-2.02r2/debian/control 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/debian/control 2022-01-12 13:15:35.000000000 +0000 @@ -2,7 +2,7 @@ Section: games Priority: optional Maintainer: Brandon Barnes -Build-Depends: debhelper (>= 5), libx11-dev, libxpm-dev, x11proto-core-dev +Build-Depends: debhelper (>= 11), libx11-dev, libxpm-dev, x11proto-core-dev Standards-Version: 3.9.2 Package: xevil diff -Nru xevil-2.02r2/debian/copyright xevil-2.02r2/debian/copyright --- xevil-2.02r2/debian/copyright 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/debian/copyright 2022-01-12 13:15:35.000000000 +0000 @@ -1,25 +1,31 @@ -This package was debianized by Ben C. Hendrickson on -Thursday, 20 Jan 2000 5:48:08 -0700. - -It was downloaded from ftp://ftp.xevil.com/developer/xevilsrc2.02p2.zip - -Upstream Author: Steve Hardt - -Copyright (C) 1994, 2000 Steve Hardt and Michael Judge - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -On Debian systems, the complete text of the GNU General Public -License can be found in /usr/share/common-licenses/GPL-2 file. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: xevil +Upstream-Contact: Steve Hardt +Source: ftp://ftp.xevil.com/developer/xevilsrc2.02p2.zip + +Files: * +Copyright: 1994-2000 Steve Hardt and Michael Judge +License: GPL-2.0+ + +Files: debian/* +Copyright: 2000 Ben C. Hendrickson +License: GPL-2.0+ + +License: GPL-2.0+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. + . + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL-2 file. diff -Nru xevil-2.02r2/debian/patches/0001_port_to_gcc6.patch xevil-2.02r2/debian/patches/0001_port_to_gcc6.patch --- xevil-2.02r2/debian/patches/0001_port_to_gcc6.patch 1970-01-01 00:00:00.000000000 +0000 +++ xevil-2.02r2/debian/patches/0001_port_to_gcc6.patch 2022-01-12 13:15:35.000000000 +0000 @@ -0,0 +1,4507 @@ +Index: xevil-2.02r2/cmn/actual.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/actual.cpp ++++ xevil-2.02r2/cmn/actual.cpp +@@ -32,7 +32,7 @@ + + // Include Files + #if X11 +-#include ++#include + #endif + #if WIN32 + #include +@@ -122,6 +122,7 @@ + #include "bitmaps/yeti/yeti.bitmaps" + + ++using namespace std; + + ///// Some helper macros to define creatures with certain abilities. + #define DEFINE_CREATURE_CTORS_2(CLASSNAME,ABILITY0,ability0,ABILITY1,ability1) \ +@@ -454,9 +455,9 @@ void Explosion::act() { + } + } + +- ostrstream msg; +- msg << "Explosion hits " << hit << " objects." << ends; +- locator->message_enq(msg.str()); ++ stringstream msg; ++ msg << "Explosion hits " << hit << " objects."; ++ locator->message_enq(Utils::strdup(msg.str().c_str())); + + kill_self(); + Physical::act(); +@@ -1001,7 +1002,7 @@ Boolean AltarOfSin::corporeal_attack(Phy + if (other && (other->get_class_id() != A_AltarOfSin) && + (intel = other->get_intel())) { + LocatorP locator = get_locator(); +- ostrstream str; ++ stringstream str; + + // Turned into a frog/baby seal. + if (Utils::coin_flip() && other->is_moving() && +@@ -1014,8 +1015,8 @@ Boolean AltarOfSin::corporeal_attack(Phy + + str << intel->get_name() << " attacks the Altar of Sin and is " + << "turned into a " << (doFrog ? "frog" : "baby-seal") +- << "." << ends; +- locator->message_enq(str.str()); ++ << "."; ++ locator->message_enq(Utils::strdup(str.str().c_str())); + + other->set_intel(NULL); + if (!other->get_mapped()) { +@@ -1047,8 +1048,8 @@ Boolean AltarOfSin::corporeal_attack(Phy + // Lose all health. + else { + str << "BLASPHMER! " << intel->get_name() << +- " loses health for daring to attack the Altar of Sin." << ends; +- locator->message_enq(str.str()); ++ " loses health for daring to attack the Altar of Sin."; ++ locator->message_enq(Utils::strdup(str.str().c_str())); + + int damage = other->get_health(); + other->corporeal_attack(this,damage); +@@ -1075,8 +1076,8 @@ void AltarOfSin::collide(PhysicalP other + (intel = other->get_intel()) && intel->is_human()) { + int lives = intel->get_lives(); + LocatorP locator = get_locator(); +- ostrstream msg; +- ostrstream arenaMsg; ++ stringstream msg; ++ stringstream arenaMsg; + + // Choose different blessings to give. + int n = 0; +@@ -1112,8 +1113,8 @@ void AltarOfSin::collide(PhysicalP other + } + else { + intel->set_lives(lives + 1); +- msg << intel->get_name() << " sells soul for an extra life." << ends; +- arenaMsg << "You Sold Your Soul For an Extra Life" << ends; ++ msg << intel->get_name() << " sells soul for an extra life."; ++ arenaMsg << "You Sold Your Soul For an Extra Life"; + } + break; + +@@ -1123,8 +1124,8 @@ void AltarOfSin::collide(PhysicalP other + mod = new DoubleSpeed(); + assert(mod); + modList->append_unique(mod); +- msg << intel->get_name() << " sells soul for Double Speed." << ends; +- arenaMsg << "Double Speed" << ends; ++ msg << intel->get_name() << " sells soul for Double Speed."; ++ arenaMsg << "Double Speed"; + break; + + +@@ -1138,9 +1139,8 @@ void AltarOfSin::collide(PhysicalP other + mod = new DoubleJump(); + assert(mod); + modList->append_unique(mod); +- msg << intel->get_name() << " sells soul for extra jumping powers." +- << ends; +- arenaMsg << "Extra Jumping Powers" << ends; ++ msg << intel->get_name() << " sells soul for extra jumping powers."; ++ arenaMsg << "Extra Jumping Powers"; + break; + + +@@ -1157,8 +1157,8 @@ void AltarOfSin::collide(PhysicalP other + // So max health takes effect immediately. + other->heal(); + +- msg << intel->get_name() << " sells soul for Double Health." << ends; +- arenaMsg << "Double Health" << ends; ++ msg << intel->get_name() << " sells soul for Double Health."; ++ arenaMsg << "Double Health"; + break; + + +@@ -1176,8 +1176,8 @@ void AltarOfSin::collide(PhysicalP other + // Might as well make sure they can take advantage of it now. + other->heal(); + +- msg << intel->get_name() << " sells soul for Healing Powers." << ends; +- arenaMsg << "Healing Powers" << ends; ++ msg << intel->get_name() << " sells soul for Healing Powers."; ++ arenaMsg << "Healing Powers"; + } + break; + +@@ -1193,8 +1193,8 @@ void AltarOfSin::collide(PhysicalP other + // Already checked that other is a Creature(). + ((CreatureP)other)->add_ability(a); + +- msg << intel->get_name() << " sells soul for HellFire Powers." << ends; +- arenaMsg << "HellFire Powers" << ends; ++ msg << intel->get_name() << " sells soul for HellFire Powers."; ++ arenaMsg << "HellFire Powers"; + } + break; + +@@ -1217,8 +1217,8 @@ void AltarOfSin::collide(PhysicalP other + // Already checked that other is a Creature(). + ((CreatureP)other)->add_ability(a); + +- msg << intel->get_name() << " sells soul for Fireballs." << ends; +- arenaMsg << "Fireballs" << ends; ++ msg << intel->get_name() << " sells soul for Fireballs."; ++ arenaMsg << "Fireballs"; + } + break; + +@@ -1241,8 +1241,8 @@ void AltarOfSin::collide(PhysicalP other + // Already checked that other is a Creature(). + ((CreatureP)other)->add_ability(a); + +- msg << intel->get_name() << " sells soul for Flying Powers." << ends; +- arenaMsg << "Flying Powers" << ends; ++ msg << intel->get_name() << " sells soul for Flying Powers."; ++ arenaMsg << "Flying Powers"; + } + break; + +@@ -1274,8 +1274,8 @@ void AltarOfSin::collide(PhysicalP other + // Already checked that other is a Creature(). + ((CreatureP)other)->add_ability(a); + +- msg << intel->get_name() << " sells soul for Sticky Powers." << ends; +- arenaMsg << "Sticky Powers" << ends; ++ msg << intel->get_name() << " sells soul for Sticky Powers."; ++ arenaMsg << "Sticky Powers"; + } + break; + +@@ -1285,8 +1285,8 @@ void AltarOfSin::collide(PhysicalP other + } + } // while + +- locator->message_enq(msg.str()); +- locator->arena_message_enq(arenaMsg.str(),other); ++ locator->message_enq(Utils::strdup(msg.str().c_str())); ++ locator->arena_message_enq(Utils::strdup(arenaMsg.str().c_str()),other); + + kill_self(); + turnTaken = True; +@@ -1534,7 +1534,7 @@ Boolean Transmogifier::transmogify_targe + void *closure) { + // notThis is used to prevent transmogifying into the same class an object + // already is. +- ClassId notThis = (ClassId)closure; ++ ClassId notThis = (long)closure; + if (pc->classId == notThis) { + return False; + } +@@ -2087,10 +2087,9 @@ void Trapdoor::act() + PhysicalP seal = new Seal(w,l,pos); + assert(seal); + +- char sealStr[20]; +- ostrstream str(sealStr,20); +- str << "seal-" << sealsNum << ends; +- NeutralP sealIntel = new SealIntel(w,l,sealStr,homeId); ++ stringstream str; ++ str << "seal-" << sealsNum; ++ NeutralP sealIntel = new SealIntel(w,l,Utils::strdup(str.str().c_str()),homeId); + seal->set_intel(sealIntel); + l->register_neutral(sealIntel); + seals[sealsNum] = sealIntel->get_intel_id(); +Index: xevil-2.02r2/cmn/area.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/area.cpp ++++ xevil-2.02r2/cmn/area.cpp +@@ -34,12 +34,13 @@ + extern "C" { + #include // For INT_MAX + } +-#include ++#include + #include "utils.h" + #include "coord.h" + #include "area.h" + + ++using namespace std; + + Size Area::operator - (const Area &other) const { + assert ((shape == AR_RECT) && (other.shape == AR_RECT)); +Index: xevil-2.02r2/cmn/coord.h +=================================================================== +--- xevil-2.02r2.orig/cmn/coord.h ++++ xevil-2.02r2/cmn/coord.h +@@ -619,7 +619,7 @@ struct DifficultyLevel { + int enemiesInitial; // enemies on first level + int enemiesIncr; // this many more enemies each level + int enemiesMax; // maximum number of enemies (for levels) +- char *name; // of this difficulty level ++ const char *name; // of this difficulty level + }; + enum {DIFF_TRIVIAL,DIFF_NORMAL,DIFF_HARD,DIFF_BEND_OVER, + DIFFICULTY_LEVELS_NUM, DIFF_NONE=DIFFICULTY_LEVELS_NUM}; +Index: xevil-2.02r2/cmn/game.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/game.cpp ++++ xevil-2.02r2/cmn/game.cpp +@@ -31,16 +31,17 @@ + #include "stdafx.h" + extern "C" { + #include ++#include + } + + #if X11 +-#include ++#include + #endif + #if WIN32 + #include + #endif + +-#include ++#include + + #include "utils.h" + #include "coord.h" +@@ -123,7 +124,7 @@ extern "C" { + #define SOUNDONOFF_DEFAULT True + + +-char *Game::wittySayings[Game::WITTY_SAYINGS_NUM] = { ++const char *Game::wittySayings[Game::WITTY_SAYINGS_NUM] = { + "If it moves it's a threat. If it doesn't move it's a potential threat.", + "Happy, happy. Joy, joy.", + "For the mother country!!!", +@@ -271,11 +272,19 @@ char *Game::wittySayings[Game::WITTY_SAY + "Prepare to Qualify.", + "I got a bad feeling about this drop.", + "Cowboys never quit!", ++ "The voices say I'm not crazy, so I'm OK!", ++ "Cure Sars!?!", ++ "Ha Ha Ha, Loser!", ++ "It's all fun and games until someone loses an eye.", ++ "Eye for an eye, tooth for a tooth.", ++ "Mo-o-m!", ++ "Timmy's touching me!", ++ "I'm not touching you! See? I'm not touching you!" + }; + + + +-char *Game::intelNames[Game::INTEL_NAMES_NUM] = { ++const char *Game::intelNames[Game::INTEL_NAMES_NUM] = { + "Dr. Pain", + "Steve", + "hardts", +@@ -350,6 +359,9 @@ char *Game::intelNames[Game::INTEL_NAMES + "Stan", + "Mr. Hat", + "Cid", ++ "Mr. Hankey", ++ "Michael Jackson", ++ "O.J. Simpson" + }; + + +@@ -565,7 +577,7 @@ void GameObjects::level_reset(const Dim + assert(maximums[weapons[n]->classId] == 0); + + // Don't allow objectWorldPercent values that are too small. +- float objWPercent = (float)max(weapons[n]->objectWorldPercent, ++ float objWPercent = (float)MAX(weapons[n]->objectWorldPercent, + OBJECT_WORLD_PERCENT_MIN); + + maximums[weapons[n]->classId] = (int)ceil(areaFactor * objWPercent); +@@ -578,7 +590,7 @@ void GameObjects::level_reset(const Dim + for (n = 0; n < oItemsNum; n++) { + // Check not already set. + assert(maximums[oItems[n]->classId] == 0); +- float objWPercent = (float)max(oItems[n]->objectWorldPercent, ++ float objWPercent = (float)MAX(oItems[n]->objectWorldPercent, + OBJECT_WORLD_PERCENT_MIN); + + maximums[oItems[n]->classId] = (int)ceil(areaFactor * objWPercent); +@@ -793,7 +805,7 @@ Game::Game(int *arg_c,char **arg_v) + + // Just for tracing in the debugger. + char* version = Utils::get_OS_info(); +- delete version; ++ delete [] version; + + noUi = False; + noNewLevel = False; +@@ -1056,7 +1068,7 @@ Game::Game(int *arg_c,char **arg_v) + + Game::~Game() { + if (oneItem) { +- delete oneItem; ++ delete [] oneItem; + } + + delete ui; +@@ -1500,13 +1512,13 @@ void Game::ui_settings_check(RestartEnd + + if (mask & UIconnectServer) { + delete role; +- ostrstream portName; +- portName << settings.connectPort << ends; ++ stringstream portName; ++ portName << settings.connectPort; + IViewportInfo* vInfo = Ui::get_viewport_info(); +- ClientP client = new Client(settings.connectHostname,portName.str(), ++ ClientP client = new Client(settings.connectHostname, ++ Utils::strdup(portName.str().c_str()), + 0,settings.humanName,vInfo, + Connection::ADJUST_SKIP,&locator); +- delete portName.str(); + assert(client); + role = client; + ui->set_role_type(role->get_type()); +@@ -1544,10 +1556,9 @@ void Game::ui_settings_check(RestartEnd + } + + delete role; +- ostrstream portName; +- portName << settings.serverPort << ends; +- role = new Server(settings.localHuman,portName.str(),&locator); +- delete portName.str(); ++ stringstream portName; ++ portName << settings.serverPort; ++ role = new Server(settings.localHuman,portName.str().c_str(),&locator); + assert(role); + restartEnd = RE_RESTART; + ui->set_role_type(role->get_type()); +@@ -1573,9 +1584,9 @@ void Game::set_style_next(GameStyleType + ui->set_style(styleType); + } + +- ostrstream str; ++ stringstream str; + styleNext->describe(str); +- locator.message_enq(str.str()); ++ locator.message_enq(Utils::strdup(str.str().c_str())); + } + + +@@ -1589,9 +1600,9 @@ void Game::reincarnations_check() { + human->reincarnate(); + obj->set_intel(human); + +- ostrstream msg; +- msg << human->get_name() << " is back from the dead." << ends; +- locator.message_enq(msg.str()); ++ stringstream msg; ++ msg << human->get_name() << " is back from the dead."; ++ locator.message_enq(Utils::strdup(msg.str().c_str())); + } + } + +@@ -1615,7 +1626,7 @@ void Game::game_over_check(int humansPla + void Game::new_level_check(int enemiesPlaying) { + assert(state == gameOn); + +- ostrstream str; ++ stringstream str; + Boolean lStrChanged = False; + int val = style->new_level_check(enemiesPlaying,&world,&locator, + level,lStrChanged,str,timer, +@@ -1645,11 +1656,8 @@ void Game::new_level_check(int enemiesPl + // if str has anything in it. Fucking Linux compilers. + if (lStrChanged) { + if (ui) { +- ui->set_level(str.str()); ++ ui->set_level(str.str().c_str()); + } +- // Ok to delete even if ui is NULL, str.str() will allocate the memory to +- // kill off. +- delete str.str(); + } + } + +@@ -1841,7 +1849,7 @@ PhysicalP Game::enemy_physical(ClassId c + + + +-char *Game::choose_ranking(int kills) { ++const char *Game::choose_ranking(int kills) { + // Figure out the ranking set, they are listed in order. + int setNum = 0; + assert(kills >= 0 && rankingSets[0].killsMin == 0); +@@ -1876,7 +1884,7 @@ void Game::end_game(Boolean showMessages + if (showMessages) { + for (int n = 0; n < locator.humans_registered(); n++) { + HumanP human = locator.get_human(n); +- ostrstream msg; ++ stringstream msg; + + // Soups are only taken into account if you have unlimited lives. + int totalKills; +@@ -1894,11 +1902,11 @@ void Game::end_game(Boolean showMessages + totalKills = human->get_human_kills() + human->get_enemy_kills(); + } + +- char *ranking = choose_ranking(totalKills); ++ const char *ranking = choose_ranking(totalKills); + msg << totalKills << (totalKills == 1 ? "Kill" : " Kills") +- << ", Rank: " << ranking << ends; ++ << ", Rank: " << ranking; + IntelId humanIntelId = human->get_intel_id(); +- locator.arena_message_enq(msg.str(),&humanIntelId,10000); ++ locator.arena_message_enq(Utils::strdup(msg.str().c_str()),&humanIntelId,10000); + } + } + } +@@ -1919,8 +1927,8 @@ void Game::new_level() { + // Will clean out non-persistent teams. + locator.level_reset(); + +- ostrstream lStr; // For level box on the side of the ui-> +- ostrstream lTitleStr; // For Ui title screen. ++ stringstream lStr; // For level box on the side of the ui-> ++ stringstream lTitleStr; // For Ui title screen. + Boolean doBonus; + + // Possibly increment level count number. +@@ -1960,7 +1968,7 @@ void Game::new_level() { + if (doBonus) { + delete levelTitleStored; // If it already exists. + // Store levelTitle string for later use. +- levelTitleStored = lTitleStr.str(); ++ levelTitleStored = Utils::strdup(lTitleStr.str().c_str()); + + // Tell user about the bonus. + award_bonuses_now(); +@@ -1970,13 +1978,12 @@ void Game::new_level() { + } + // Go to getBearings state. + else { +- get_bearings(lTitleStr.str()); ++ get_bearings(Utils::strdup(lTitleStr.str().c_str())); + } + + if (ui) { +- ui->set_level(lStr.str()); ++ ui->set_level(lStr.str().c_str()); + } +- delete lStr.str(); + + // Will pass in more info later. + role->new_level(this,&world,&locator); +@@ -1997,7 +2004,7 @@ void Game::award_bonuses_now() { + continue; + } + +- char* awardMsg = NULL; ++ const char* awardMsg = NULL; + int count = 0; + while (!awardMsg && count < AWARD_BONUS_TRIES) { + count++; +@@ -2184,9 +2191,9 @@ void Game::reset() { + + // Moved resetting world rooms to new_level(); + +- ostrstream msg; +- msg << wittySayings[Utils::choose(WITTY_SAYINGS_NUM)] << ends; +- locator.message_enq(msg.str()); ++ stringstream msg; ++ msg << wittySayings[Utils::choose(WITTY_SAYINGS_NUM)]; ++ locator.message_enq(Utils::strdup(msg.str().c_str())); + + /* Don't need to call Ui::set_* because the new values originally came + from ui-> */ +@@ -2242,41 +2249,39 @@ void Game::process_x_resources(int *,cha + { // Right keys. + right[n][which] = 0; + +- ostrstream strm; ++ stringstream strm; + if (which == 0) +- strm << "right_" << keysNames[n] << ends; ++ strm << "right_" << keysNames[n]; + else +- strm << "right_" << keysNames[n] << "_2" << ends; +- char *option = strm.str(); ++ strm << "right_" << keysNames[n] << "_2"; ++ const string & option = strm.str(); + + // Should we free value?? +- char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option); ++ char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option.c_str()); + if (value) { + KeySym keysym = XStringToKeysym(value); + if (keysym != NoSymbol) + right[n][which] = keysym; + } +- delete option; + } + + { // Left Keys. + left[n][which] = 0; + +- ostrstream strm; ++ stringstream strm; + if (which == 0) +- strm << "left_" << keysNames[n] << ends; ++ strm << "left_" << keysNames[n]; + else +- strm << "left_" << keysNames[n] << "_2" << ends; +- char *option = strm.str(); ++ strm << "left_" << keysNames[n] << "_2"; ++ const string & option = strm.str(); + + // Should we free value?? +- char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option); ++ char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option.c_str()); + if (value) { + KeySym keysym = XStringToKeysym(value); + if (keysym != NoSymbol) + left[n][which] = keysym; + } +- delete option; + } + } + +@@ -2291,10 +2296,10 @@ void Game::process_x_resources(int *,cha + void Game::parse_args(int *argc,char **argv) { + // Create a bunch of "-name" strings for comparing with command-line + // args. +- ostrstream dashName[Locator::HUMANS_MAX]; ++ stringstream dashName[Locator::HUMANS_MAX]; + int n; + for (n = 0; n < Locator::HUMANS_MAX; n++) { +- dashName[n] << "-name" << n << ends; ++ dashName[n] << "-name" << n; + } + + // Defaults +@@ -2351,7 +2356,7 @@ void Game::parse_args(int *argc,char **a + // Check "-name" arguments. + else { + for (int j = 0; j < Locator::HUMANS_MAX; j++) { +- if ((! strcmp(dashName[j].str(),argv[n])) && (n + 1 < *argc)) { ++ if ((! strcmp(dashName[j].str().c_str(),argv[n])) && (n + 1 < *argc)) { + humanNames[j] = Utils::strdup(argv[n+1]); + n++; + } +@@ -2728,12 +2733,6 @@ void Game::parse_args(int *argc,char **a + n++; + } + } // for +- +- +- // Delete memory for "-name" strings. +- for (n = 0; n < Locator::HUMANS_MAX; n++) { +- delete dashName[n].str(); +- } + } + + +@@ -2741,15 +2740,15 @@ void Game::parse_args(int *argc,char **a + char **Game::display_names(int *argc,char **argv) { + + #if X11 +- ostrstream dashDisplay[UI_VIEWPORTS_MAX][2]; ++ stringstream dashDisplay[UI_VIEWPORTS_MAX][2]; + char **displayNames = new charP [UI_VIEWPORTS_MAX]; + + int n; + for (n = 0; n < UI_VIEWPORTS_MAX; n++) { + displayNames[n] = new char [Xvars::DISPLAY_NAME_LENGTH]; + strcpy(displayNames[n],""); +- dashDisplay[n][0] << "-display" << n << ends; +- dashDisplay[n][1] << "-d" << n << ends; ++ dashDisplay[n][0] << "-display" << n; ++ dashDisplay[n][1] << "-d" << n; + } + + // Loop through all command line arguments. +@@ -2765,7 +2764,7 @@ char **Game::display_names(int *argc,cha + // Set display name for one viewport. + for (int m = 0; m < UI_VIEWPORTS_MAX; m++) { + for (int which = 0; which < 2; which++) { +- if (!strcmp(argv[n],dashDisplay[m][which].str())) { ++ if (!strcmp(argv[n],dashDisplay[m][which].str().c_str())) { + assert(strlen(argv[n+1]) < Xvars::DISPLAY_NAME_LENGTH); + strcpy(displayNames[m],argv[n+1]); + } +@@ -2773,11 +2772,6 @@ char **Game::display_names(int *argc,cha + } + } + +- for (n = 0; n < UI_VIEWPORTS_MAX; n++) { +- for (int which = 0; which < 2; which++) { +- delete dashDisplay[n][which].str(); +- } +- } + return displayNames; + #endif + +@@ -2890,7 +2884,7 @@ void Game::create_human_and_physical(int + assert(role->get_type() != R_CLIENT); + + // Choose random name if -name was not specified for this player. +- char *nameNonPc = ++ const char *nameNonPc = + Utils::strlen(humanNames[h]) ? + humanNames[h] : + intelNames[intelNamesIndices[h % INTEL_NAMES_NUM]]; +@@ -2954,13 +2948,12 @@ void Game::intro() { + + // Put message in the status bar when the game starts up. + // Use \n in string for locator.message_enq. +- ostrstream msg; ++ stringstream msg; + msg + << "XEvil(TM) " << VERSION + << " http://www.xevil.com satan@xevil.com " << XETP::versionStr << "\n" +- << "Copyright(C) 1994,2000 Steve Hardt and Michael Judge" +- << ends; +- locator.message_enq(msg.str()); ++ << "Copyright(C) 1994,2000 Steve Hardt and Michael Judge"; ++ locator.message_enq(Utils::strdup(msg.str().c_str())); + + + // Print message to standard out. Doesn't really do anything on Windows. +@@ -3075,11 +3068,10 @@ PhysicalP Game::create_enemy(PhysicalP o + IntelOptions ops; + ITmask opMask = intel_options_for(ops,obj->get_class_id()); + +- ostrstream name; +- name << "Machine-" << (enemyNameCount++) << ends; +- EnemyP enemy = new Enemy(&world,&locator,name.str(),&ops,opMask); ++ stringstream name; ++ name << "Machine-" << (enemyNameCount++); ++ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(),&ops,opMask); + assert(enemy); +- delete name.str(); + locator.register_enemy(enemy); + + if (addToLocator) { +@@ -3235,14 +3227,13 @@ void Game::demo_setup() + switch (Utils::choose(8)) { + case 0: { // A bunch of Heros and an Alien. + for (int n = 0; n < 10; n++) { +- ostrstream name; +- name << "Enemy-" << n << ends; ++ stringstream name; ++ name << "Enemy-" << n; + IntelOptions ops; + ops.harmless = True; +- EnemyP enemy = new Enemy(&world,&locator,name.str(), ++ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), + &ops,ITharmless); + assert(enemy); +- delete name.str(); + locator.register_enemy(enemy); + + Pos pos = world.empty_rect(Hero::get_size_max()); +@@ -3268,16 +3259,15 @@ void Game::demo_setup() + + case 1: { // Hero, FThrower, and a bunch of Frogs (does not mean Frenchmen). + for (int n = 0; n < 15; n++) { +- ostrstream name; +- name << "Enemy-" << n << ends; ++ stringstream name; ++ name << "Enemy-" << n; + IntelOptions ops; + ops.psychotic = Utils::coin_flip(); +- EnemyP enemy = new Enemy(&world,&locator,name.str(), ++ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), + &ops,ITpsychotic); + assert(enemy); +- delete name.str(); + locator.register_enemy(enemy); +- ++ + Pos pos = world.empty_rect(Frog::get_size_max()); + PhysicalP obj = new Frog(&world,&locator,pos); + assert(obj); +@@ -3304,15 +3294,14 @@ void Game::demo_setup() + case 2: { // A bunch of Enforcers. + for (int n = 0; n < 10; n++) + { +- ostrstream name; +- name << "Enemy-" << n << ends; ++ stringstream name; ++ name << "Enemy-" << n; + IntelOptions ops; + ops.classFriends = False; + ops.psychotic = True; +- EnemyP enemy = new Enemy(&world,&locator,name.str(), ++ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), + &ops,ITclassFriends|ITpsychotic); + assert(enemy); +- delete name.str(); + locator.register_enemy(enemy); + + Pos pos = world.empty_rect(Enforcer::get_size_max()); +@@ -3327,14 +3316,13 @@ void Game::demo_setup() + + case 3: { // A bunch of Ninjas and a chainsaw. + for (int n = 0; n < 10; n++) { +- ostrstream name; +- name << "Enemy-" << n << ends; ++ stringstream name; ++ name << "Enemy-" << n; + IntelOptions ops; + ops.classFriends = False; +- EnemyP enemy = new Enemy(&world,&locator,name.str(), ++ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), + &ops,ITclassFriends); + assert(enemy); +- delete name.str(); + locator.register_enemy(enemy); + + Pos pos = world.empty_rect(Ninja::get_size_max()); +@@ -3373,12 +3361,11 @@ void Game::demo_setup() + } + + for (int m = 0; m < 10; m++) { +- ostrstream name; +- name << "Enemy-" << m << ends; +- EnemyP enemy = new Enemy(&world,&locator,name.str(), ++ stringstream name; ++ name << "Enemy-" << m; ++ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), + NULL,ITnone); + assert(enemy); +- delete name.str(); + locator.register_enemy(enemy); + + Pos pos = world.empty_rect(Hero::get_size_max()); +@@ -3414,14 +3401,13 @@ void Game::demo_setup() + case 5: { // Ninjas and ChopperBoys. + int n; + for (n = 0; n < 10; n++) { +- ostrstream name; +- name << "Enemy-" << n << ends; ++ stringstream name; ++ name << "Enemy-" << n; + IntelOptions ops; + ops.classFriends = False; +- EnemyP enemy = new Enemy(&world,&locator,name.str(), ++ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(), + &ops,ITclassFriends); + assert(enemy); +- delete name.str(); + locator.register_enemy(enemy); + + PhysicalP obj; +@@ -3458,11 +3444,10 @@ void Game::demo_setup() + // and the scenario isn't set up yet. + + for (n = 0; n < 9; n++) { +- ostrstream name; +- name << "Dog-" << n << ends; +- EnemyP intel = new Enemy(&world,&locator,name.str(),NULL,ITnone); ++ stringstream name; ++ name << "Dog-" << n; ++ EnemyP intel = new Enemy(&world,&locator,name.str().c_str(),NULL,ITnone); + assert(intel); +- delete name.str(); + locator.register_enemy(intel); + + Pos pos = world.empty_rect(Dog::get_size_max()); +@@ -3473,13 +3458,12 @@ void Game::demo_setup() + } + + for (n = 0; n < 3; n++) { +- ostrstream name; +- name << "Enemy-" << n << ends; ++ stringstream name; ++ name << "Enemy-" << n; + IntelOptions ops; + ops.harmless = True; +- EnemyP enemy = new Enemy(&world,&locator,name.str(),&ops,ITharmless); ++ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(),&ops,ITharmless); + assert(enemy); +- delete name.str(); + locator.register_enemy(enemy); + + PhysicalP obj; +@@ -3510,13 +3494,12 @@ void Game::demo_setup() + Segmented::create_and_add_composite(ret,&world,&locator,Dragon::SEGMENTS_NUM,pos, + Dragon::create,NULL); + for (int m = 0; m < ret.length(); m++) { +- ostrstream name; +- name << "Enemy-" << n << ends; ++ stringstream name; ++ name << "Enemy-" << n; + IntelOptions ops; + ops.harmless = True; +- EnemyP enemy = new Enemy(&world,&locator,name.str(),&ops,ITharmless); ++ EnemyP enemy = new Enemy(&world,&locator,name.str().c_str(),&ops,ITharmless); + assert(enemy); +- delete name.str(); + locator.register_enemy(enemy); + PhysicalP p = (PhysicalP)ret.get(m); + p->set_intel(enemy); +Index: xevil-2.02r2/cmn/game.h +=================================================================== +--- xevil-2.02r2.orig/cmn/game.h ++++ xevil-2.02r2/cmn/game.h +@@ -35,7 +35,7 @@ + extern "C" { + #include + } +-#include ++#include + #include "utils.h" + #include "ui.h" + #include "world.h" +@@ -136,7 +136,7 @@ private: + struct RankingSet { + enum {RANKING_SET_MAX = 8}; // Max number of rankings in a set. + int killsMin; // Min number of kills to get this rank. +- char *rankings[RANKING_SET_MAX + 1]; // Extra for NULL. ++ const char *rankings[RANKING_SET_MAX + 1]; // Extra for NULL. + }; + + +@@ -268,8 +268,8 @@ class Game: public IPhysicalManager, pub + + private: + enum { +- WITTY_SAYINGS_NUM = 147, +- INTEL_NAMES_NUM = 74, ++ WITTY_SAYINGS_NUM = 155, ++ INTEL_NAMES_NUM = 77, + RANKING_SETS_NUM = 12, + }; + +@@ -306,7 +306,7 @@ private: + static Boolean potential_enemy_filter(const PhysicalContext* pc,void*); + /* EFFECTS: Filter those classes whose potentialEnemy flag is True. */ + +- char *choose_ranking(int kills); ++ const char *choose_ranking(int kills); + /* EFFECTS: Choose a rank for the player at the end of game based on the + number of kills. */ + +@@ -412,8 +412,8 @@ private: + SoundName currentSoundName; + //keeps track of current sound track being played: can be 0 + +- static char *wittySayings[WITTY_SAYINGS_NUM]; +- static char *intelNames[INTEL_NAMES_NUM]; ++ static const char *wittySayings[WITTY_SAYINGS_NUM]; ++ static const char *intelNames[INTEL_NAMES_NUM]; + static DifficultyLevel difficultyLevels[DIFFICULTY_LEVELS_NUM]; + static RankingSet rankingSets[RANKING_SETS_NUM]; + +Index: xevil-2.02r2/cmn/game_style.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/game_style.cpp ++++ xevil-2.02r2/cmn/game_style.cpp +@@ -33,15 +33,9 @@ extern "C" { + #include + } + +-#if X11 +-#include +-#endif +- +-#if WIN32 +-#include +-#endif ++#include + +-#include ++#include + #include "utils.h" + #include "coord.h" + #include "world.h" +@@ -109,13 +103,13 @@ public: + /* DEFAULT: True */ + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP) = 0; + + virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &) = 0; + virtual void new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum) = 0; + /* EFFECTS: These two functions start a new level in a scenario. setup_world() should + just setup the map and size of the world. new_level() is called after world.reset() +@@ -158,13 +152,13 @@ public: + virtual ScenarioType get_scenario_type() {return EXTERMINATE;} + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); + virtual void new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum); + + +@@ -183,13 +177,13 @@ public: + virtual Boolean can_refill_game_objects(); + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); + virtual void new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum); + + virtual void new_level_set_timer(Timer &timer); +@@ -209,7 +203,7 @@ public: + virtual ScenarioType get_scenario_type() {return HIVE;} + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual Boolean award_bonus(); +@@ -218,7 +212,7 @@ public: + virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); + virtual void new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum); + + virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); +@@ -242,13 +236,13 @@ public: + virtual ScenarioType get_scenario_type() {return CAPTURE_THE_FLAG;} + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); + virtual void new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum); + + virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); +@@ -269,7 +263,7 @@ public: + virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); + virtual void new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum); + + virtual Boolean advance_level(); +@@ -292,7 +286,7 @@ protected: + + virtual Boolean (*get_team())(LocatorP,PhysicalP,PhysicalP) = 0; + +- virtual void set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr) = 0; ++ virtual void set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr) = 0; + /* EFFECTS: Called in new_level() to set the appropriate messages. */ + + +@@ -311,7 +305,7 @@ public: + virtual ScenarioType get_scenario_type() {return SEALS;} + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual Boolean award_bonus(); +@@ -323,7 +317,7 @@ protected: + #endif + virtual Boolean (*get_team())(LocatorP,PhysicalP,PhysicalP); + +- virtual void set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr); ++ virtual void set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr); + + + private: +@@ -342,7 +336,7 @@ public: + virtual ScenarioType get_scenario_type() {return ANTI_SEALS;} + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + +@@ -351,7 +345,7 @@ protected: + #endif + virtual Boolean (*get_team())(LocatorP,PhysicalP,PhysicalP); + +- virtual void set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr); ++ virtual void set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr); + + + private: +@@ -369,13 +363,13 @@ public: + virtual SoundName get_midisoundtrack(){return SoundNames::FIRE_SOUNDTRACK;} + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); + virtual void new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum); + + virtual Boolean award_bonus(); +@@ -391,13 +385,13 @@ public: + virtual ScenarioType get_scenario_type() {return KILL_THE_DRAGON;} + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); + virtual void new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum); + + virtual SoundName get_midisoundtrack(){return SoundNames::FIRE_SOUNDTRACK;} +@@ -419,13 +413,13 @@ public: + virtual Pos human_initial_pos(WorldP,LocatorP,const Size &s); + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); + virtual void new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum); + + virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); +@@ -447,13 +441,13 @@ public: + virtual ScenarioType get_scenario_type() {return THE_POUND;} + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); + virtual void new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum); + }; + +@@ -466,13 +460,13 @@ public: + virtual ScenarioType get_scenario_type() {return JAPAN_TOWN;} + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual void setup_world(WorldP,LocatorP,const DifficultyLevel &); + virtual void new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum); + + virtual void filter_weapons_and_other_items(LocatorP,int &weaponsNum, +@@ -581,7 +575,7 @@ Boolean GameStyle::need_difficulty(int) + + + int GameStyle::new_level_check(int,WorldP,LocatorP, +- int,Boolean &,ostrstream &,Timer &timer, ++ int,Boolean &,stringstream &,Timer &timer, + IPhysicalManagerP) { + // A timer-based level. + if (timer.ready()) { +@@ -791,8 +785,8 @@ GameStyleP Normal::clone() { + + + +-void Normal::describe(ostrstream &str) { +- str << "Complete each level/scenario to proceed to the next one." << ends; ++void Normal::describe(stringstream &str) { ++ str << "Complete each level/scenario to proceed to the next one."; + } + + +@@ -852,7 +846,7 @@ void Normal::reset(WorldP w,LocatorP l,c + + + int Normal::new_level_check(int enemiesPlaying,WorldP w,LocatorP l, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP manager) { + GameStyleP delegate = get_delegate(); + return delegate->new_level_check(enemiesPlaying,w,l,level,lStrChanged,levelStr,timer,manager); +@@ -876,7 +870,7 @@ Boolean Normal::award_bonus() { + + void Normal::new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum) { + // Choose which delegate to use. + if (level % NORMAL_SCENARIOS_FREQUENCY == 0) { +@@ -934,11 +928,10 @@ GameStyleP Levels::clone() { + + + +-void Levels::describe(ostrstream &str) { ++void Levels::describe(stringstream &str) { + str << "Human player(s) fights through increasing levels of " + << "difficulty." << "\n" +- << "To complete a level you must kill all enemy players." +- << ends; ++ << "To complete a level you must kill all enemy players."; + } + + +@@ -969,7 +962,7 @@ void Levels::reset(WorldP,LocatorP,cons + + + int Levels::new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int,Boolean &,ostrstream &,Timer &, ++ int,Boolean &,stringstream &,Timer &, + IPhysicalManagerP) { + if (enemiesPlaying == 0) { + return 1; +@@ -983,7 +976,7 @@ int Levels::new_level_check(int enemiesP + + void Levels::new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int) { + world->reset(); + +@@ -991,8 +984,8 @@ void Levels::new_level(int level,WorldP + clean_physicals(False,world,locator,manager); + + +- lTitleStr << "[" << level << "] Kill All Machines" << ends; +- lStr << "Level: " << level << ends; ++ lTitleStr << "[" << level << "] Kill All Machines"; ++ lStr << "Level: " << level; + + enemiesNum += dLevel.enemiesIncr; + enemiesNum = Utils::minimum(enemiesNum,dLevel.enemiesMax); +@@ -1037,8 +1030,8 @@ GameStyleP KillKillKill::clone() { + + + +-void KillKillKill::describe(ostrstream &str) { +- str << "Every human and machine for him/her/itself." << ends; ++void KillKillKill::describe(stringstream &str) { ++ str << "Every human and machine for him/her/itself."; + } + + +@@ -1095,15 +1088,15 @@ Boolean KillKillKill::game_over_check(in + + void KillKillKill::new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int) { + world->reset(); + + // Don't wipe out the Enemies. + clean_physicals(True,world,locator,manager); + +- lTitleStr << "Level: " << level << ends; +- lStr << "Level: " << level << ends; ++ lTitleStr << "Level: " << level; ++ lStr << "Level: " << level; + + // Only create enemies first time or if enemiesRefill is set. + if (justReset) { +@@ -1152,9 +1145,9 @@ GameStyleP Duel::clone() { + + + +-void Duel::describe(ostrstream &str) { ++void Duel::describe(stringstream &str) { + str << "Human vs. human battle to the death." +- << "\n" << "Each human has 3 lives." << ends; ++ << "\n" << "Each human has 3 lives."; + } + + +@@ -1207,13 +1200,13 @@ Boolean Duel::game_over_check(int humans + + void Duel::new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int) { + world->reset(); + clean_physicals(False,world,locator,manager); + +- lTitleStr << "Level: " << level << ends; +- lStr << "Level: " << level << ends; ++ lTitleStr << "Level: " << level; ++ lStr << "Level: " << level; + + // Only create enemies first time. + if (justReset) { +@@ -1256,9 +1249,9 @@ GameStyleP ExtendedDuel::clone() { + + + +-void ExtendedDuel::describe(ostrstream &str) { ++void ExtendedDuel::describe(stringstream &str) { + str << "Human vs. human battle to the death." +- << "\n" << "Unlimited lives." << ends; ++ << "\n" << "Unlimited lives."; + } + + +@@ -1318,13 +1311,13 @@ Boolean ExtendedDuel::game_over_check(in + + void ExtendedDuel::new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int) { + world->reset(); + clean_physicals(False,world,locator,manager); + +- lTitleStr << "Level: " << level << ends; +- lStr << "Level: " << level << ends; ++ lTitleStr << "Level: " << level; ++ lStr << "Level: " << level; + + // Only create enemies first time. + if (justReset) { +@@ -1367,8 +1360,8 @@ GameStyleP Training::clone() { + + + +-void Training::describe(ostrstream &str) { +- str << "No enemies. Useful for learning the controls." << ends; ++void Training::describe(stringstream &str) { ++ str << "No enemies. Useful for learning the controls."; + } + + +@@ -1392,13 +1385,13 @@ void Training::reset(WorldP,LocatorP,con + + void Training::new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int) { + world->reset(); + clean_physicals(False,world,locator,manager); + +- lTitleStr << "Level: " << level << ends; +- lStr << "Level: " << level << ends; ++ lTitleStr << "Level: " << level; ++ lStr << "Level: " << level; + } + + +@@ -1428,10 +1421,10 @@ GameStyleP Scenarios::clone() { + + + +-void Scenarios::describe(ostrstream &str) { ++void Scenarios::describe(stringstream &str) { + str << "A number of different scenarios." << "\n" + << "You must complete each scenario to continue on to the " +- << "next one." << ends; ++ << "next one."; + } + + +@@ -1499,7 +1492,7 @@ void Scenarios::reset(WorldP,LocatorP,co + + int Scenarios::new_level_check(int enemiesPlaying,WorldP w,LocatorP l, + int level,Boolean &lStrChanged, +- ostrstream &levelStr,Timer &timer, ++ stringstream &levelStr,Timer &timer, + IPhysicalManagerP manager) { + assert(scenario); + return scenario->new_level_check(enemiesPlaying,w,l,level, +@@ -1534,7 +1527,7 @@ Boolean Scenarios::award_bonus() { + + void Scenarios::new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int humansNum) { + // Works even if scenario is NULL. + if (!scenario || scenario->advance_level()) { +@@ -1804,7 +1797,7 @@ Exterminate::Exterminate() + + + int Exterminate::new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int,Boolean &,ostrstream &,Timer &, ++ int,Boolean &,stringstream &,Timer &, + IPhysicalManagerP) { + if (enemiesPlaying == 0) { + return 1; +@@ -1822,10 +1815,10 @@ void Exterminate::setup_world(WorldP,Loc + + void Exterminate::new_level(int level,WorldP,LocatorP, + const DifficultyLevel &dLevel, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int) { +- lTitleStr << "[" << level << "] EXTERMINATE" << ends; +- lStr << "[" << level << "] EXTERMINATE\nKill all machines." << ends; ++ lTitleStr << "[" << level << "] EXTERMINATE"; ++ lStr << "[" << level << "] EXTERMINATE\nKill all machines."; + + // Doesn't increment like LEVELS game style + enemiesNum = dLevel.enemiesIncr; +@@ -1852,7 +1845,7 @@ Boolean Bonus::can_refill_game_objects() + + int Bonus::new_level_check(int,WorldP,LocatorP locator, + int level,Boolean &lStrChanged, +- ostrstream &levelStr,Timer &timer, ++ stringstream &levelStr,Timer &timer, + IPhysicalManagerP) { + // Ran out of time. + if (timer.ready()) { +@@ -1873,13 +1866,13 @@ int Bonus::new_level_check(int,WorldP,Lo + if (remaining != frogsRemaining) { + frogsRemaining = remaining; + levelStr << "[" << level << "] BONUS LEVEL\nfrogs remaining: " +- << remaining << ends; ++ << remaining; + lStrChanged = True; + if (remaining > 0) { +- ostrstream arenaStr; ++ stringstream arenaStr; + arenaStr << remaining << " Frog" << +- (remaining > 1 ? "s" : "") << " Remaining" << ends; +- locator->arena_message_enq(arenaStr.str()); ++ (remaining > 1 ? "s" : "") << " Remaining"; ++ locator->arena_message_enq(Utils::strdup(arenaStr.str().c_str())); + } + + // Will only be called once per level. +@@ -1907,7 +1900,7 @@ void Bonus::setup_world(WorldP world,Loc + + void Bonus::new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int) { + // Create frogs + for (int n = 0; n < SCENARIO_BONUS_FROGS; n++) { +@@ -1940,9 +1933,9 @@ void Bonus::new_level(int level,WorldP w + frogsRemaining = SCENARIO_BONUS_FROGS; + + lTitleStr << "[" << level << "] Bonus Level: Kill " +- << (int)SCENARIO_BONUS_FROGS << " Frogs" << ends; ++ << (int)SCENARIO_BONUS_FROGS << " Frogs"; + lStr << "[" << level << "] BONUS LEVEL\nfrogs remaining: " +- << (int)SCENARIO_BONUS_FROGS << ends; ++ << (int)SCENARIO_BONUS_FROGS; + } + + +@@ -1960,7 +1953,7 @@ Hive::Hive() { + + + int Hive::new_level_check(int,WorldP,LocatorP locator, +- int,Boolean &,ostrstream &,Timer &, ++ int,Boolean &,stringstream &,Timer &, + IPhysicalManagerP) { + PhysicalP xit = locator->lookup(xitId); + assert(xit); // The Xit should never be destroyed. +@@ -1987,7 +1980,7 @@ void Hive::setup_world(WorldP world,Loca + + void Hive::new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int) { + // Aliens are created in Game::clock. + +@@ -2012,8 +2005,8 @@ void Hive::new_level(int level,WorldP wo + locator->add(egg); + } + +- lTitleStr << "[" << level << "] HIVE" << ends; +- lStr << "[" << level << "] HIVE.\nFind the exit." << ends; ++ lTitleStr << "[" << level << "] HIVE"; ++ lStr << "[" << level << "] HIVE.\nFind the exit."; + } + + +@@ -2073,7 +2066,7 @@ CaptureTheFlag::CaptureTheFlag() + + + int CaptureTheFlag::new_level_check(int,WorldP,LocatorP locator, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &, + IPhysicalManagerP manager) { + int fRemaining = 0; + for (int n = 0; n < SCENARIO_FLAG_FLAGS; n++) { +@@ -2091,19 +2084,19 @@ int CaptureTheFlag::new_level_check(int, + flagsRemaining = fRemaining; + levelStr << "[" << level << "] COLLECT " + << (int)SCENARIO_FLAG_FLAGS +- << " FLAGS\nremaining: "<< flagsRemaining << ends; ++ << " FLAGS\nremaining: "<< flagsRemaining; + lStrChanged = True; + +- ostrstream arenaStr; ++ stringstream arenaStr; + if (fRemaining != 0) { + arenaStr << flagsRemaining << " Flag" << +- (flagsRemaining > 1 ? "s" : "") << " Remaining" << ends; ++ (flagsRemaining > 1 ? "s" : "") << " Remaining"; + } + else { +- arenaStr << "All Flags Collected" << ends; ++ arenaStr << "All Flags Collected"; + } + +- locator->arena_message_enq(arenaStr.str()); ++ locator->arena_message_enq(Utils::strdup(arenaStr.str().c_str())); + } + + if (fRemaining == 0) { // All flags are gone, so end level. +@@ -2124,7 +2117,7 @@ void CaptureTheFlag::setup_world(WorldP + + void CaptureTheFlag::new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP,int) { + for (int n = 0; n < SCENARIO_FLAG_FLAGS; n++) { + Pos pos = world->empty_accessible_rect(Flag::get_size_max()); +@@ -2136,9 +2129,9 @@ void CaptureTheFlag::new_level(int level + flagsRemaining = SCENARIO_FLAG_FLAGS; + + lTitleStr << "[" << level << "] Capture The Flag: " +- << (int)SCENARIO_FLAG_FLAGS << " Flags" << ends; ++ << (int)SCENARIO_FLAG_FLAGS << " Flags"; + lStr << "[" << level << "] COLLECT " << (int)SCENARIO_FLAG_FLAGS +- << " FLAGS.\nremaining: " << (int)SCENARIO_FLAG_FLAGS << ends; ++ << " FLAGS.\nremaining: " << (int)SCENARIO_FLAG_FLAGS; + } + + +@@ -2169,7 +2162,7 @@ void GenericSeals::setup_world(WorldP wo + + void GenericSeals::new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP,int) { + // Add a team for each human in the game. + // Don't use locator->humans_registered() because they may not have been +@@ -2298,7 +2291,7 @@ Seals::Seals() { + + + int Seals::new_level_check(int,WorldP,LocatorP locator, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &, + IPhysicalManagerP) { + int lemOut,lemSafe,lemActive,lemDead; + compute_out_safe_active_dead(locator,lemOut,lemSafe,lemActive,lemDead); +@@ -2312,10 +2305,10 @@ int Seals::new_level_check(int,WorldP,Lo + + // Only update arena string if sealsSafe has changed. + if (lemSafe != sealsSafe && lemSafe != SCENARIO_SEALS_NEED) { +- ostrstream arenaStr; ++ stringstream arenaStr; + arenaStr << "Save " << (SCENARIO_SEALS_NEED - lemSafe) +- << " More Baby Seals" << ends; +- locator->arena_message_enq(arenaStr.str()); ++ << " More Baby Seals"; ++ locator->arena_message_enq(Utils::strdup(arenaStr.str().c_str())); + } + + sealsSafe = lemSafe; +@@ -2324,18 +2317,17 @@ int Seals::new_level_check(int,WorldP,Lo + levelStr << "[" << level << "] SAVE " + << (int)SCENARIO_SEALS_NEED << " BABY SEALS\n" + << "out: " << sealsOut << " safe: " << sealsSafe +- << " dead: " << lemDead +- << ends; ++ << " dead: " << lemDead; + lStrChanged = True; + + // New level if enough seals are safe or too many are dead. + if (lemDead > (SCENARIO_SEALS_SEALS - SCENARIO_SEALS_NEED) + || lemSafe >= SCENARIO_SEALS_NEED) { + if (lemSafe < SCENARIO_SEALS_NEED) { +- ostrstream msg; ++ stringstream msg; + msg << "YOU FAILED TO SAVE " << (int)SCENARIO_SEALS_NEED +- << " BABY SEALS. TRY THIS LEVEL AGAIN." << ends; +- locator->arena_message_enq(msg.str()); ++ << " BABY SEALS. TRY THIS LEVEL AGAIN."; ++ locator->arena_message_enq(Utils::strdup(msg.str().c_str())); + } + else { + locator->arena_message_enq(Utils::strdup("Good work. Go to the next level.")); +@@ -2365,11 +2357,10 @@ Boolean (* Seals::get_team())(LocatorP,P + + + +-void Seals::set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr) { +- lTitleStr << "[" << level << "] SAVE THE BABY SEALS" << ends; ++void Seals::set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr) { ++ lTitleStr << "[" << level << "] SAVE THE BABY SEALS"; + lStr << "[" << level << "] SAVE "<< +- (int)SCENARIO_SEALS_NEED << " BABY SEALS\n" +- << "out: 0 safe: 0 dead: 0" << ends; ++ (int)SCENARIO_SEALS_NEED << " BABY SEALS\n" << "out: 0 safe: 0 dead: 0"; + } + + +@@ -2430,7 +2421,7 @@ AntiSeals::AntiSeals() { + + + int AntiSeals::new_level_check(int,WorldP,LocatorP locator, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &, + IPhysicalManagerP) { + // level not over by default. + int ret = -1; +@@ -2441,15 +2432,13 @@ int AntiSeals::new_level_check(int,World + + // Failure + if (lemSafe > SCENARIO_ANTI_SEALS_MAX_SLIPPAGE) { +- ostrstream msg; + #if 0 + // Not enough space on screen, need two lines. + msg << "YOU LET TOO MANY OF THE FAT BASTARDS GET AWAY\n" + << "Try this level again" << ends; + #else +- msg << "YOU LET TOO MANY OF THE FAT BASTARDS GET AWAY" << ends; + #endif +- locator->arena_message_enq(msg.str()); ++ locator->arena_message_enq(Utils::strdup("YOU LET TOO MANY OF THE FAT BASTARDS GET AWAY")); + + // start new level + ret = 1; +@@ -2473,13 +2462,11 @@ int AntiSeals::new_level_check(int,World + } + // Update UI + else if (lemSafe == sealsSafe) { // o.w. the "one got away" message takes priority +- ostrstream arenaStr; +- arenaStr << "Kill " +- << lemToKill << " More Baby Seals" << ends; +- locator->arena_message_enq(arenaStr.str()); ++ stringstream arenaStr; ++ arenaStr << "Kill " << lemToKill << " More Baby Seals"; ++ locator->arena_message_enq(Utils::strdup(arenaStr.str().c_str())); + +- levelStr << "[" << level << "] KILL " +- << lemToKill << " BABY SEALS" << ends; ++ levelStr << "[" << level << "] KILL " << lemToKill << " BABY SEALS"; + lStrChanged = True; + } + } // lemDead != sealsDead +@@ -2502,10 +2489,10 @@ Boolean (*AntiSeals::get_team())(Locator + + + +-void AntiSeals::set_level_strings(int level,ostrstream &lStr,ostrstream &lTitleStr) { +- lTitleStr << "[" << level << "] KILL THE BABY SEALS" << ends; ++void AntiSeals::set_level_strings(int level,stringstream &lStr,stringstream &lTitleStr) { ++ lTitleStr << "[" << level << "] KILL THE BABY SEALS"; + lStr << "[" << level << "] KILL "<< +- (int)SCENARIO_SEALS_SEALS << " BABY SEALS" << ends; ++ (int)SCENARIO_SEALS_SEALS << " BABY SEALS"; + } + + +@@ -2552,7 +2539,7 @@ KillTheFireDemon::KillTheFireDemon() { + + + int KillTheFireDemon::new_level_check(int enemiesPlaying,WorldP,LocatorP locator, +- int,Boolean &,ostrstream &,Timer &, ++ int,Boolean &,stringstream &,Timer &, + IPhysicalManagerP) { + if (enemiesPlaying == 0) { + locator->arena_message_enq(Utils::strdup("Take That, You Mother-Fucking Spawn From Hell")); +@@ -2572,12 +2559,12 @@ void KillTheFireDemon::setup_world(World + + void KillTheFireDemon::new_level(int level,WorldP,LocatorP, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int) { + manager->create_enemy(manager->enemy_physical(A_FireDemon)); + +- lTitleStr << "[" << level << "] FIRE DEMON" << ends; +- lStr << "[" << level << "] Kill the Fire Demon." << ends; ++ lTitleStr << "[" << level << "] FIRE DEMON"; ++ lStr << "[" << level << "] Kill the Fire Demon."; + } + + +@@ -2594,7 +2581,7 @@ KillTheDragon::KillTheDragon(){ + + + int KillTheDragon::new_level_check(int enemiesPlaying,WorldP,LocatorP locator, +- int,Boolean &,ostrstream &,Timer &, ++ int,Boolean &,stringstream &,Timer &, + IPhysicalManagerP) { + if (enemiesPlaying == 0) { + locator->arena_message_enq(Utils::strdup("The Infernal Worm has been vanquished")); +@@ -2614,7 +2601,7 @@ void KillTheDragon::setup_world(WorldP w + + void KillTheDragon::new_level(int level,WorldP w,LocatorP l, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int) { + const PhysicalContext *cx = &Dragon::creatureContext.movingContext.physicalContext; + Pos pos = w->empty_rect(cx->sizeMax); +@@ -2628,8 +2615,8 @@ void KillTheDragon::new_level(int level, + manager->create_enemy(p,False); + } + +- lTitleStr << "[" << level << "] Dragon" << ends; +- lStr << "[" << level << "] Kill the Dragon." << ends; ++ lTitleStr << "[" << level << "] Dragon"; ++ lStr << "[" << level << "] Kill the Dragon."; + } + + +@@ -2667,7 +2654,7 @@ Pos ZigZag::human_initial_pos(WorldP wor + + + int ZigZag::new_level_check(int,WorldP world,LocatorP locator, +- int,Boolean &,ostrstream &,Timer &, ++ int,Boolean &,stringstream &,Timer &, + IPhysicalManagerP) { + PhysicalP xit = locator->lookup(xitId); + assert(xit); // The Xit should never be destroyed. +@@ -2680,7 +2667,7 @@ int ZigZag::new_level_check(int,WorldP w + HumanP human = locator->get_human(n); + if (human) { + // previous depth +- int depthOld = (int)human->get_data(); ++ long depthOld = (long)human->get_data(); + Id id = human->get_id(); + + // Get physical for intelligence +@@ -2697,9 +2684,9 @@ int ZigZag::new_level_check(int,WorldP w + human->set_data((void *)depth); + + // Use 1-based counting for the User. +- ostrstream str; +- str << "Depth " << (depth + 1) << ends; +- locator->arena_message_enq(str.str(),p); ++ stringstream str; ++ str << "Depth " << (depth + 1); ++ locator->arena_message_enq(Utils::strdup(str.str().c_str()),p); + } + } + } +@@ -2718,7 +2705,7 @@ void ZigZag::setup_world(WorldP world,Lo + + void ZigZag::new_level(int level,WorldP world,LocatorP locator, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP,int) { + Rooms worldRooms = world->get_rooms(); + RoomIndex upperRight(0,worldRooms.acrossMax - 1); +@@ -2731,9 +2718,8 @@ void ZigZag::new_level(int level,WorldP + xitId = p->get_id(); + + // 1-based counting of depth for the user. +- lTitleStr << "[" << level << "] ZIG-ZAG: Depth " +- << worldRooms.downMax << ends; +- lStr << "[" << level << "] ZIG-ZAG.\nFind the exit." << ends; ++ lTitleStr << "[" << level << "] ZIG-ZAG: Depth " << worldRooms.downMax; ++ lStr << "[" << level << "] ZIG-ZAG.\nFind the exit."; + } + + +@@ -2761,7 +2747,7 @@ ThePound::ThePound(){ + + + int ThePound::new_level_check(int enemiesPlaying,WorldP,LocatorP locator, +- int,Boolean &,ostrstream &,Timer &, ++ int,Boolean &,stringstream &,Timer &, + IPhysicalManagerP) { + if (enemiesPlaying == 0) { + locator->arena_message_enq(Utils::strdup("Killed the Mutts")); +@@ -2781,7 +2767,7 @@ void ThePound::setup_world(WorldP world, + + void ThePound::new_level(int level,WorldP,LocatorP locator, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int) { + locator->add_team(Scenarios::dog_team,NULL); + +@@ -2789,8 +2775,8 @@ void ThePound::new_level(int level,World + manager->create_enemy(manager->enemy_physical(A_Dog)); + } + +- lTitleStr << "[" << level << "] The Pound" << ends; +- lStr << "[" << level << "] The Pound" << ends; ++ lTitleStr << "[" << level << "] The Pound"; ++ lStr << "[" << level << "] The Pound"; + } + + +@@ -2801,7 +2787,7 @@ JapanTown::JapanTown() + + + int JapanTown::new_level_check(int enemiesPlaying,WorldP,LocatorP locator, +- int,Boolean &,ostrstream &,Timer &, ++ int,Boolean &,stringstream &,Timer &, + IPhysicalManagerP) { + if (enemiesPlaying == 0) { + locator->arena_message_enq(Utils::strdup("Damn Ninjas. Worse than roaches.")); +@@ -2821,7 +2807,7 @@ void JapanTown::setup_world(WorldP world + + void JapanTown::new_level(int level,WorldP,LocatorP locator, + const DifficultyLevel &, +- ostrstream &lStr,ostrstream &lTitleStr, ++ stringstream &lStr,stringstream &lTitleStr, + IPhysicalManagerP manager,int) { + locator->add_team(JapanTown::ninja_team,NULL); + +@@ -2829,8 +2815,8 @@ void JapanTown::new_level(int level,Worl + manager->create_enemy(manager->enemy_physical(A_Ninja)); + } + +- lTitleStr << "[" << level << "] Japan-Town" << ends; +- lStr << "[" << level << "] Japan-Town" << ends; ++ lTitleStr << "[" << level << "] Japan-Town"; ++ lStr << "[" << level << "] Japan-Town"; + } + + +Index: xevil-2.02r2/cmn/game_style.h +=================================================================== +--- xevil-2.02r2.orig/cmn/game_style.h ++++ xevil-2.02r2/cmn/game_style.h +@@ -30,12 +30,7 @@ + #endif + #endif + +-#if X11 +-#include +-#endif +-#if WIN32 +-#include +-#endif ++#include + + #include "utils.h" + #include "coord.h" +@@ -44,6 +39,8 @@ + #include "intel.h" + + ++using namespace std; ++ + #define SCENARIO_SEALS_TRAPDOORS 2 + #define SCENARIO_BONUS_FROGS 12 + #define SCENARIO_FLAG_FLAGS 15 +@@ -91,7 +88,7 @@ public: + + virtual GameStyle *clone() = 0; + +- virtual void describe(ostrstream &) = 0; ++ virtual void describe(stringstream &) = 0; + /* EFFECTS: Write a two-line description of the style to the stream. */ + + virtual GameStyleType get_type() = 0; +@@ -137,7 +134,7 @@ public: + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, + int level, +- Boolean &lStrChanged,ostrstream &levelStr, ++ Boolean &lStrChanged,stringstream &levelStr, + Timer &timer, + IPhysicalManagerP); + /* MODIFIES: lStrChanged */ +@@ -166,7 +163,7 @@ public: + + virtual void new_level(int level,WorldP,LocatorP, + const DifficultyLevel &dLevel, +- ostrstream &levelStr,ostrstream &levelTitleStr, ++ stringstream &levelStr,stringstream &levelTitleStr, + IPhysicalManagerP,int humansNum) = 0; + /* MODIFIES: level */ + /* EFFECTS: Start a new level. Use levelStr levelTitleStr to +@@ -249,7 +246,7 @@ public: + + virtual GameStyleP clone(); + +- virtual void describe(ostrstream &); ++ virtual void describe(stringstream &); + + virtual GameStyleType get_type(); + +@@ -269,7 +266,7 @@ public: + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, + int level,Boolean &lStrChanged, +- ostrstream &levelStr,Timer &timer, ++ stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual Boolean advance_level(); +@@ -277,7 +274,7 @@ public: + virtual Boolean award_bonus(); + + virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, +- ostrstream &levelStr,ostrstream &levelTitleStr, ++ stringstream &levelStr,stringstream &levelTitleStr, + IPhysicalManagerP,int humansNum); + + virtual void new_level_set_timer(Timer &timer); +@@ -305,7 +302,7 @@ public: + + virtual GameStyleP clone(); + +- virtual void describe(ostrstream &); ++ virtual void describe(stringstream &); + + virtual GameStyleType get_type(); + +@@ -314,11 +311,11 @@ public: + virtual void reset(WorldP,LocatorP,const DifficultyLevel &,int enemiesNumNext); + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, +- ostrstream &levelStr,ostrstream &levelTitleStr, ++ stringstream &levelStr,stringstream &levelTitleStr, + IPhysicalManagerP,int humansNum); + + virtual void new_level_set_timer(Timer &timer); +@@ -340,7 +337,7 @@ public: + + virtual GameStyleP clone(); + +- virtual void describe(ostrstream &); ++ virtual void describe(stringstream &); + + virtual GameStyleType get_type(); + +@@ -355,7 +352,7 @@ public: + virtual Boolean game_over_check(int humansPlaying,int enemiesPlaying); + + virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, +- ostrstream &levelStr,ostrstream &levelTitleStr, ++ stringstream &levelStr,stringstream &levelTitleStr, + IPhysicalManagerP,int humansNum); + + virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); +@@ -376,7 +373,7 @@ public: + + virtual GameStyleP clone(); + +- virtual void describe(ostrstream &); ++ virtual void describe(stringstream &); + + virtual GameStyleType get_type(); + +@@ -389,7 +386,7 @@ public: + virtual Boolean game_over_check(int humansPlaying,int enemiesPlaying); + + virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, +- ostrstream &levelStr,ostrstream &levelTitleStr, ++ stringstream &levelStr,stringstream &levelTitleStr, + IPhysicalManagerP,int humansNum); + + virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); +@@ -408,7 +405,7 @@ public: + + virtual GameStyleP clone(); + +- virtual void describe(ostrstream &); ++ virtual void describe(stringstream &); + + virtual GameStyleType get_type(); + +@@ -423,7 +420,7 @@ public: + virtual Boolean game_over_check(int humansPlaying,int enemiesPlaying); + + virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, +- ostrstream &levelStr,ostrstream &levelTitleStr, ++ stringstream &levelStr,stringstream &levelTitleStr, + IPhysicalManagerP,int humansNum); + + virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); +@@ -442,7 +439,7 @@ public: + + virtual GameStyleP clone(); + +- virtual void describe(ostrstream &); ++ virtual void describe(stringstream &); + + virtual GameStyleType get_type(); + +@@ -451,7 +448,7 @@ public: + virtual void reset(WorldP,LocatorP,const DifficultyLevel &dLevel,int); + + virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, +- ostrstream &levelStr,ostrstream &levelTitleStr, ++ stringstream &levelStr,stringstream &levelTitleStr, + IPhysicalManagerP,int humansNum); + + virtual void refill_enemies(Boolean enemiesRefill,WorldP,LocatorP,IPhysicalManagerP); +@@ -466,7 +463,7 @@ public: + + virtual GameStyleP clone(); + +- virtual void describe(ostrstream &); ++ virtual void describe(stringstream &); + + virtual GameStyleType get_type(); + +@@ -485,7 +482,7 @@ public: + virtual void reset(WorldP,LocatorP,const DifficultyLevel &,int enemiesNumNext); + + virtual int new_level_check(int enemiesPlaying,WorldP,LocatorP, +- int level,Boolean &lStrChanged,ostrstream &levelStr,Timer &timer, ++ int level,Boolean &lStrChanged,stringstream &levelStr,Timer &timer, + IPhysicalManagerP); + + virtual Boolean advance_level(); +@@ -493,7 +490,7 @@ public: + virtual Boolean award_bonus(); + + virtual void new_level(int level,WorldP,LocatorP,const DifficultyLevel &dLevel, +- ostrstream &levelStr,ostrstream &levelTitleStr, ++ stringstream &levelStr,stringstream &levelTitleStr, + IPhysicalManagerP manager,int humansNum); + + virtual void new_level_set_timer(Timer &timer); +Index: xevil-2.02r2/cmn/intel.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/intel.cpp ++++ xevil-2.02r2/cmn/intel.cpp +@@ -35,7 +35,7 @@ extern "C" { + #include + } + #if X11 +-#include ++#include + #endif + #if WIN32 + #include +@@ -50,6 +50,7 @@ extern "C" { + #include "xdata.h" + + ++using namespace std; + + // Defines + #define FIGHT_RANGE 40 // made it smaller for Dogs 45 // [50-40] +@@ -212,7 +213,7 @@ Boolean IntelStatus::operator == (const + + + +-Intel::Intel(WorldP w,LocatorP l,char *name, ++Intel::Intel(WorldP w,LocatorP l,const char *name, + const IntelOptions *ops,ITmask opMask) { + intelStatusChanged = True; + living = True; +@@ -755,7 +756,7 @@ void Intel::_set_lives(int) + + + +-Human::Human(WorldP w,LocatorP l,char *name,int lves, ++Human::Human(WorldP w,LocatorP l,const char *name,int lves, + int *sharedLves,ColorNum cNum) + : Intel(w,l,name,NULL,ITnone) { + lives = lves; +@@ -931,7 +932,7 @@ void Human::_set_lives(int val) { + + + +-Machine::Machine(WorldP w,LocatorP l,char *name,const IntelOptions *ops, ++Machine::Machine(WorldP w,LocatorP l,const char *name,const IntelOptions *ops, + ITmask opMask) + : Intel(w,l,name,ops,opMask) + { +@@ -1829,7 +1830,7 @@ void Machine::use_items(Boolean &command + + + +-Enemy::Enemy(WorldP w,LocatorP l,char *name, ++Enemy::Enemy(WorldP w,LocatorP l,const char *name, + const IntelOptions *ops,ITmask opMask) + :Machine(w,l,name,ops,opMask) {} + +@@ -1854,7 +1855,7 @@ int Enemy::reflexesTime = DEFAULT_REFLEX + + + +-Neutral::Neutral(WorldP w,LocatorP l,char *name, ++Neutral::Neutral(WorldP w,LocatorP l,const char *name, + const IntelOptions *ops,ITmask opMask) + :Machine(w,l,name,ops,opMask) {} + +@@ -1867,7 +1868,7 @@ Boolean Neutral::is_enemy() + + + +-SealIntel::SealIntel(WorldP w,LocatorP l,char *name,const Id &home_id) ++SealIntel::SealIntel(WorldP w,LocatorP l,const char *name,const Id &home_id) + :Neutral(w,l,name,NULL,ITnone) + { + // Timer oTimer(LADDER_JUMP_TIME); +@@ -1906,7 +1907,7 @@ void SealIntel::choose_strategy(Physical + + + +-DoppelIntel::DoppelIntel(WorldP w,LocatorP l,char *name, ++DoppelIntel::DoppelIntel(WorldP w,LocatorP l,const char *name, + const IntelOptions *ops,ITmask opMask,IntelP master) + :Neutral(w,l,name,ops,opMask) { + assert(master); +@@ -2073,7 +2074,7 @@ ITmask DoppelIntel::suggestedMask = + + + +-Pet::Pet(WorldP w,LocatorP l,char *name, ++Pet::Pet(WorldP w,LocatorP l,const char *name, + const IntelOptions *ops,ITmask opMask,IntelP master) + :DoppelIntel(w,l,name,ops,opMask,master) { + mode = Heel; +@@ -2095,7 +2096,7 @@ void mode_helper(int prev,int curr) { + char buffer[80]; + ostrstream str(buffer,80); + str << "mode changing from:" << Pet::mode_string(prev) << +- " to: " << Pet::mode_string(curr) << endl << ends; ++ " to: " << Pet::mode_string(curr) << endl; + #if WIN32 + TRACE(buffer); + #endif +@@ -2308,7 +2309,7 @@ Boolean Pet::filter_target(PhysicalP can + + + +-char *Pet::mode_string(int mode) { ++const char *Pet::mode_string(int mode) { + switch (mode) { + case Heel: + return "Heel"; +Index: xevil-2.02r2/cmn/intel.h +=================================================================== +--- xevil-2.02r2.orig/cmn/intel.h ++++ xevil-2.02r2/cmn/intel.h +@@ -123,7 +123,7 @@ struct IntelStatus { + // Class Definitions. + class Intel { + public: +- Intel(WorldP w,LocatorP l,char *name, ++ Intel(WorldP w,LocatorP l,const char *name, + const IntelOptions *ops,ITmask opMask); + /* EFFECTS: Create a new intel with the options specified in opMakse that are + in ops. ops will never be referenced if opMask is ITnone. lives now +@@ -293,7 +293,7 @@ typedef Intel *IntelP; + // Simply buffers input from a user interface. + class Human: public Intel { + public: +- Human(WorldP w,LocatorP l,char *name,int lives, ++ Human(WorldP w,LocatorP l,const char *name,int lives, + int *sharedLives,ColorNum colorNum); + /* NOTE: Uses all default options. intelOptions should be meaningless for + a human. If "sharedLives" is non-null, ignore "lives" and share the lives. */ +@@ -346,7 +346,7 @@ typedef Human *HumanP; + + class Machine: public Intel { + public: +- Machine(WorldP w,LocatorP l,char *name, ++ Machine(WorldP w,LocatorP l,const char *name, + const IntelOptions *ops,ITmask opMask); + + virtual IntelId get_master_intel_id(); +@@ -464,7 +464,7 @@ typedef Machine *MachineP; + + class Enemy: public Machine { + public: +- Enemy(WorldP w,LocatorP l,char *name, ++ Enemy(WorldP w,LocatorP l,const char *name, + const IntelOptions *ops,ITmask opMask); + + static void set_reflexes_time(int time) {reflexesTime = time;} +@@ -491,7 +491,7 @@ typedef Enemy *EnemyP; + + class Neutral: public Machine { + public: +- Neutral(WorldP w,LocatorP l,char *name, ++ Neutral(WorldP w,LocatorP l,const char *name, + const IntelOptions *ops,ITmask opMask); + + virtual Boolean is_enemy(); +@@ -502,7 +502,7 @@ typedef Neutral *NeutralP; + + class SealIntel: public Neutral { + public: +- SealIntel(WorldP w,LocatorP l,char *name,const Id &homeId); ++ SealIntel(WorldP w,LocatorP l,const char *name,const Id &homeId); + + virtual Boolean is_seal_intel(); + +@@ -522,7 +522,7 @@ protected: + + class DoppelIntel: public Neutral { + public: +- DoppelIntel(WorldP w,LocatorP l,char *name, ++ DoppelIntel(WorldP w,LocatorP l,const char *name, + const IntelOptions *ops,ITmask opMask, + IntelP master = NULL); + +@@ -572,7 +572,7 @@ private: + // in choose_strategy() and go_get_em(). + class Pet: public DoppelIntel { + public: +- Pet(WorldP w,LocatorP l,char *name, ++ Pet(WorldP w,LocatorP l,const char *name, + const IntelOptions *ops,ITmask opMask, + IntelP master = NULL); + +@@ -583,7 +583,7 @@ public: + IT_WEAPON_{some dir}, or to come back to him if command is IT_WEAPON_CENTER. + This will also set p to be the new master. */ + +- static char *mode_string(int mode); ++ static const char *mode_string(int mode); + /* NOTE: For debugging. */ + + +Index: xevil-2.02r2/cmn/locator.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/locator.cpp ++++ xevil-2.02r2/cmn/locator.cpp +@@ -50,6 +50,7 @@ + + #include "bitmaps/locator/locator.bitmaps" // for arrows + ++using namespace std; + + // When we reach this, start deleting objects. + #define OL_LIST_WARN ((int)(OL_LIST_MAX * 0.9)) +Index: xevil-2.02r2/cmn/locator.h +=================================================================== +--- xevil-2.02r2.orig/cmn/locator.h ++++ xevil-2.02r2/cmn/locator.h +@@ -47,7 +47,7 @@ the world. */ + + + // Include Files +-#include ++#include + + #include "utils.h" + #include "coord.h" +@@ -96,6 +96,8 @@ class SoundRequest; + #define OL_RECENT_SOUNDS_MAX 30 + + ++class OLgridEntry; ++class OLshadowEntry; + + // An entry for one object in the list of all objects currently in the game. + class OLentry { +Index: xevil-2.02r2/cmn/physical.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/physical.cpp ++++ xevil-2.02r2/cmn/physical.cpp +@@ -33,10 +33,10 @@ + // Include Files + #include "xdata.h" + #include "physical.h" +-#include ++#include + + #if X11 +-#include ++#include + #endif + #if WIN32 + #include +@@ -54,6 +54,7 @@ + + #include "bitmaps/transform/transform.bitmaps" + ++using namespace std; + + // Defines + #define VEL_SMALL 1 +@@ -523,9 +524,9 @@ void Physical::heat_attack(PhysicalP,int + + if (heat == 0 && heatNext > 0) { + LocatorP l = get_locator(); +- ostrstream str; +- str << get_class_name() << " is on fire." << ends; +- locator->message_enq(str.str()); ++ stringstream str; ++ str << get_class_name() << " is on fire."; ++ locator->message_enq(Utils::strdup(str.str().c_str())); + } + } + previousHeatWasSecondary = secondary; +@@ -1844,7 +1845,7 @@ void* Moving::compute_key(Dir dir,int an + } + + // Use the pixmap resource id as the base. +- u_int cmnBitsId = (unsigned int)mc->pixmapBits[baseDir][animNum]; ++ u_int cmnBitsId = (unsigned long)mc->pixmapBits[baseDir][animNum]; + + // It is ok to call OneTransform::compute_key() even if there is no + // transformation, will just return 0x0. +@@ -2556,17 +2557,17 @@ void Item::act() { + + void Item::die() { + LocatorP locator = get_locator(); +- ostrstream msg; ++ stringstream msg; + switch (dieMessage) { + case NONE: + break; + case USED: +- msg << get_class_name() << " has been used." << ends; +- locator->message_enq(msg.str()); ++ msg << get_class_name() << " has been used."; ++ locator->message_enq(Utils::strdup(msg.str().c_str())); + break; + case DESTROYED: +- msg << get_class_name() << " is destroyed." << ends; +- locator->message_enq(msg.str()); ++ msg << get_class_name() << " is destroyed."; ++ locator->message_enq(Utils::strdup(msg.str().c_str())); + break; + }; + +@@ -2650,10 +2651,8 @@ void Drugs::taken(PhysicalP p) { + // Prevent non-biologicals from picking up drugs. + + if (p->is_creature() && !((CreatureP)p)->biological()) { +- ostrstream msg; +- msg << "Non-Biological Creatures Cannot Use Drugs" << ends; + LocatorP locator = get_locator(); +- locator->arena_message_enq(msg.str(),p); ++ locator->arena_message_enq(Utils::strdup("Non-Biological Creatures Cannot Use Drugs"), p); + kill_self(); + } + else { +@@ -2673,13 +2672,11 @@ void Drugs::use(PhysicalP p) + assert(context->odChance >= 0); + if (context->odChance && Utils::choose(context->odChance) == 0) { + p->kill_self(); +- ostrstream msg; +- msg << p->get_class_name() << " dies from crack overdose." << ends; +- locator->message_enq(msg.str()); ++ stringstream msg; ++ msg << p->get_class_name() << " dies from crack overdose."; ++ locator->message_enq(Utils::strdup(msg.str().c_str())); + +- ostrstream arenaMsg; +- arenaMsg << "You Died From Drug Overdose" << ends; +- locator->arena_message_enq(arenaMsg.str(),p); ++ locator->arena_message_enq(Utils::strdup("You Died From Drug Overdose"),p); + + set_quiet_death(); // so doesn't report "has been used" message. + } +@@ -2693,9 +2690,7 @@ void Drugs::use(PhysicalP p) + } + else { + // Shouldn't get here, should kill self when picking it up. +- ostrstream msg; +- msg << "Non-Biological Creatures Cannot Use Drugs" << ends; +- locator->arena_message_enq(msg.str(),p); ++ locator->arena_message_enq(Utils::strdup("Non-Biological Creatures Cannot Use Drugs"),p); + } + + kill_self(); +@@ -4334,14 +4329,14 @@ void Creature::update() { + if (!get_quiet_death() && !alive() && + (corpseTimer.ready() || (get_health() < - cc->corpseHealth))) { + LocatorP locator = get_locator(); +- ostrstream msg; ++ stringstream msg; + if (corpseTimer.ready()) { +- msg << get_class_name() << " corpse has decomposed." << ends; +- locator->message_enq(msg.str()); ++ msg << get_class_name() << " corpse has decomposed."; ++ locator->message_enq(Utils::strdup(msg.str().c_str())); + } + else { +- msg << get_class_name() << " corpse has been destroyed." << ends; +- locator->message_enq(msg.str()); ++ msg << get_class_name() << " corpse has been destroyed."; ++ locator->message_enq(Utils::strdup(msg.str().c_str())); + } + set_delete_me(); + } +@@ -4399,9 +4394,9 @@ void Creature::die() { + set_vel_next(velNew); + set_stance_next(CO_air); + +- ostrstream msg; +- msg << get_class_name() << " has died." << ends; +- locator->message_enq(msg.str()); ++ stringstream msg; ++ msg << get_class_name() << " has died."; ++ locator->message_enq(Utils::strdup(msg.str().c_str())); + + set_no_death_delete(); + } +@@ -6072,10 +6067,10 @@ Boolean User::collide(PhysicalP other) { + } + // If User is already holding the max number of weapons. + else if (weaponsNum >= PH_WEAPONS_MAX) { +- ostrstream msg; +- msg << "Can only hold " << PH_WEAPONS_MAX << " weapons" << ends; ++ stringstream msg; ++ msg << "Can only hold " << PH_WEAPONS_MAX << " weapons"; + LocatorP locator = cre->get_locator(); +- locator->arena_message_enq(msg.str(),cre); ++ locator->arena_message_enq(Utils::strdup(msg.str().c_str()),cre); + destroyOther = True; + } + // Actually pick it up. +@@ -6124,15 +6119,14 @@ Boolean User::collide(PhysicalP other) { + else { + LocatorP locator = cre->get_locator(); + if (itemsNum == PH_ITEMS_MAX) { +- ostrstream msg; +- msg << "Can only hold " << PH_ITEMS_MAX << " items" << ends; +- locator->arena_message_enq(msg.str(),cre); ++ stringstream msg; ++ msg << "Can only hold " << PH_ITEMS_MAX << " items"; ++ locator->arena_message_enq(Utils::strdup(msg.str().c_str()),cre); + } + else if (itemClassCount >= ITEM_CLASS_MAX) { +- ostrstream msg; +- msg << "Can only hold " << ITEM_CLASS_MAX +- << " of any one item" << ends; +- locator->arena_message_enq(msg.str(),cre); ++ stringstream msg; ++ msg << "Can only hold " << ITEM_CLASS_MAX << " of any one item"; ++ locator->arena_message_enq(Utils::strdup(msg.str().c_str()),cre); + } + + other->set_quiet_death(); +@@ -6661,9 +6655,9 @@ void Carrier::act() { + ((ItemP)p)->use(cre); + } + else { +- ostrstream str; +- str << "Cannot use " << p->get_class_name() << ends; +- locator->arena_message_enq(str.str(),cre); ++ stringstream str; ++ str << "Cannot use " << p->get_class_name(); ++ locator->arena_message_enq(Utils::strdup(str.str().c_str()),cre); + } + } + break; +Index: xevil-2.02r2/cmn/physical.h +=================================================================== +--- xevil-2.02r2.orig/cmn/physical.h ++++ xevil-2.02r2/cmn/physical.h +@@ -93,7 +93,7 @@ + CLASSNAME::CLASSNAME(InStreamP in,const CLASSNAME ## Context &cx, \ + CLASSNAME ## Xdata &x_data, \ + WorldP w,LocatorP l) \ +- : PARENT(in,cx. ## parent ## Context,x_data,w,l) ++ : PARENT(in,cx. parent ## Context,x_data,w,l) + + // Used by internal nodes and leaves. + #define DEFINE_UPDATE_FROM_STREAM(CLASSNAME,PARENT) \ +Index: xevil-2.02r2/cmn/role.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/role.cpp ++++ xevil-2.02r2/cmn/role.cpp +@@ -29,9 +29,9 @@ + + #include "stdafx.h" + +-#include ++#include + #if X11 +-#include ++#include + #include + #endif + #if WIN32 +@@ -266,43 +266,39 @@ void Role::_error(const char *msg) { + + + void Role::error(const char *msg1,const char *msg2,const char *msg3) { +- ostrstream str; ++ stringstream str; + + if (msg2 == NULL) { +- str << msg1 << ends; ++ str << msg1; + } + else if (msg3 == NULL) { +- str << msg1 << msg2 << ends; ++ str << msg1 << msg2; + } + else { +- str << msg1 << msg2 << msg3 << ends; ++ str << msg1 << msg2 << msg3; + } + + // Call one argument version. +- _error(str.str()); +- +- delete str.str(); ++ _error(str.str().c_str()); + } + + + + void Role::message(const char *msg1,const char *msg2,const char *msg3) { +- ostrstream str; ++ stringstream str; + + if (msg2 == NULL) { +- str << msg1 << ends; ++ str << msg1; + } + else if (msg3 == NULL) { +- str << msg1 << msg2 << ends; ++ str << msg1 << msg2; + } + else { +- str << msg1 << msg2 << msg3 << ends; ++ str << msg1 << msg2 << msg3; + } + + // Call one argument version. +- _message(str.str()); +- +- delete str.str(); ++ _message(str.str().c_str()); + } + + +@@ -605,11 +601,11 @@ Client::Client(char *sName,char *portNam + // Display message that we are looking up IP address. + // Assumes that caller will call Client::connect_server after a turn or two, + // so the message will be displayed on the Ui. +- ostrstream str; +- str << "Looking up IP address for server " << serverName << ends; ++ stringstream str; ++ str << "Looking up IP address for server " << serverName; + // Display for a long time. +- errLocator->arena_message_enq(str.str(),NULL,1000000); +- errLocator->message_enq(Utils::strdup(str.str())); ++ errLocator->arena_message_enq(Utils::strdup(str.str().c_str()),NULL,1000000); ++ errLocator->message_enq(Utils::strdup(str.str().c_str())); + // Probably would be better to use Role::message(), but we want it to stay + // up for a long time. Should add argument to Role::message(). + +@@ -663,12 +659,10 @@ void Client::connect_server() { + } + } + if (n == CLIENT_PORT_TRIES) { +- ostrstream str; ++ stringstream str; + str << "Could not bind local UDP port to any of " +- << clientPortBase << "-" << (clientPortBase + CLIENT_PORT_TRIES - 1) +- << ends; +- error(str.str()); +- delete str.str(); ++ << clientPortBase << "-" << (clientPortBase + CLIENT_PORT_TRIES - 1); ++ error(str.str().c_str()); + return; + } + // cout << "UDP port seems to be" << client.sin_port << endl; +@@ -703,22 +697,19 @@ void Client::connect_server() { + + // Inform user of failed connection + if (!ok()) { +- strstream msg; ++ stringstream msg; + msg << "Could not connect to " << serverName << " on port " << +- port << "." << ends; +- error(msg.str()); +- delete(msg.str()); ++ port << "."; ++ error(msg.str().c_str()); + delete tcpOut; + return; + } + + // Inform user of successful connection +- strstream msg; ++ stringstream msg; + msg << hostName << " connected to " << serverName << " on port " << +- port << ends; +- message(msg.str()); +- delete msg.str(); +- ++ port; ++ message(msg.str().c_str()); + + // Create TCP and UDP streams. + tcpIn = new NetInStream(tcpSock,False); +@@ -967,11 +958,11 @@ void Client::_error(const char *msg) { + Role::_error(msg); + + if (errorLocator) { +- ostrstream str2; +- str2 << "ERROR: " << msg << ends; +- errorLocator->arena_message_enq(str2.str(),NULL,ROLE_FAILED_TIME); ++ stringstream str2; ++ str2 << "ERROR: " << msg; ++ errorLocator->arena_message_enq(Utils::strdup(str2.str().c_str()),NULL,ROLE_FAILED_TIME); + // Don't delete str2.str(), give memory to the Locator. +- errorLocator->message_enq(Utils::strdup(str2.str())); ++ errorLocator->message_enq(Utils::strdup(str2.str().c_str())); + } + #if WIN32 + // Only the client can afford to block on error messages. +@@ -986,11 +977,9 @@ void Client::_message(const char *msg) { + Role::_error(msg); + + if (errorLocator) { +- ostrstream str2; +- str2 << msg << ends; +- errorLocator->arena_message_enq(str2.str()); ++ errorLocator->arena_message_enq(Utils::strdup(msg)); + // Don't delete str2.str(), give memory to the Locator. +- errorLocator->message_enq(Utils::strdup(str2.str())); ++ errorLocator->message_enq(Utils::strdup(msg)); + } + } + +@@ -1256,10 +1245,9 @@ void Client::process_object(InStreamP in + if (turn > turnMax) { + turnMax = turn; + if (echoPingPong) { +- ostrstream str; +- str << "PONG the server with turn " << turnMax << ends; +- message(str.str()); +- delete str.str(); ++ stringstream str; ++ str << "PONG the server with turn " << turnMax; ++ message(str.str().c_str()); + } + // Tell server so it can free turn windows to send more data. + XETP::send_pong(udpOut,turnMax); +@@ -1365,10 +1353,9 @@ void Client::process_object(InStreamP in + } + } + else { +- ostrstream str; +- str << "No context for classId " << classId << ends; +- error(str.str()); +- delete str.str(); ++ stringstream str; ++ str << "No context for classId " << classId; ++ error(str.str().c_str()); + } + } + } +@@ -1582,9 +1569,9 @@ char* Connection::get_full_client_name() + return Utils::strdup(clientName); + } + +- ostrstream str; +- str << '\"' << intel->get_name() << "\"@" << clientName << ends; +- return str.str(); ++ stringstream str; ++ str << '\"' << intel->get_name() << "\"@" << clientName; ++ return Utils::strdup(str.str().c_str()); + } + + +@@ -1695,11 +1682,10 @@ void Connection::clock(Boolean turnWindo + } + + #ifdef SKIP_MESSAGES +- ostrstream msg; ++ stringstream msg; + msg << "Average delay is " << avg << " out of " +- << delaysNum << " samples." << ends; ++ << delaysNum << " samples."; + server->message(msg.str()); +- delete msg.str(); + #endif + + #if 0 +@@ -1723,10 +1709,9 @@ void Connection::clock(Boolean turnWindo + // server->error("Client has reached maximum skip value."); + // } + #ifdef SKIP_MESSAGES +- ostrstream msg; +- msg << "Increasing skip to " << skip << ends; ++ stringstream msg; ++ msg << "Increasing skip to " << skip; + server->message(msg.str()); +- delete msg.str(); + #endif + } + // We have moved back into our target range, can send more data now. +@@ -1734,10 +1719,9 @@ void Connection::clock(Boolean turnWindo + skip--; + + #ifdef SKIP_MESSAGES +- ostrstream msg; +- msg << "Decreasing skip to " << skip << ends; ++ stringstream msg; ++ msg << "Decreasing skip to " << skip; + server->message(msg.str()); +- delete msg.str(); + #endif + } + +@@ -1777,7 +1761,7 @@ Boolean Connection::echoTurnWindows = Fa + + + +-Server::Server(Boolean lHuman,char *portName,LocatorP errLocator) { ++Server::Server(Boolean lHuman,const char *portName,LocatorP errLocator) { + // Hack, using errLocator for more than reporting errors. + errLocator->set_remember_deleted(True); + errLocator->set_remember_sounds(True); +@@ -1843,19 +1827,17 @@ void Server::run() { + + // Give address to both the TCP and UDP sockets. + if (bind(tcpSock, (CMN_SOCKADDR *)&serverAddr, sizeof(serverAddr)) < 0) { +- ostrstream str; ++ stringstream str; + str << "Couldn't bind socket name to TCP socket on port " +- << port << "." << ends; +- error(str.str()); +- delete str.str(); ++ << port << "."; ++ error(str.str().c_str()); + return; + } + if (bind(udpSock, (CMN_SOCKADDR *)&serverAddr, sizeof(serverAddr)) < 0) { +- ostrstream str; ++ stringstream str; + str << "Couldn't bind socket name to UDP socket on port " +- << port << "." << ends; +- error(str.str()); +- delete str.str(); ++ << port << "."; ++ error(str.str().c_str()); + return; + } + +@@ -1868,10 +1850,9 @@ void Server::run() { + assert(udpIn); + + // Message to server log. +- strstream msg; +- msg << "Set up server on port " << port << ends; +- message(msg.str()); +- delete(msg.str()); ++ stringstream msg; ++ msg << "Set up server on port " << port; ++ message(msg.str().c_str()); + + running = True; + } +@@ -1951,10 +1932,9 @@ void Server::human_created(IGameManagerP + localHumanId = hId; + + // Log the human's name. +- strstream msg; +- msg << "Player 0 \"" << human->get_name() << '\"' << "@SERVER" << ends; +- message(msg.str()); +- delete(msg.str()); ++ stringstream msg; ++ msg << "Player 0 \"" << human->get_name() << '\"' << "@SERVER"; ++ message(msg.str().c_str()); + + return; + } +@@ -1985,12 +1965,11 @@ void Server::human_created(IGameManagerP + + // Log all the players in the game, some code duplication for the + // local human. +- ostrstream str; ++ stringstream str; + char* fullName = cn->get_full_client_name(); +- str << "Player " << num << " " << fullName << ends; +- message(str.str()); ++ str << "Player " << num << " " << fullName; ++ message(str.str().c_str()); + delete fullName; +- delete str.str(); + + // Send assign_intel via TCP + OutStreamP out = cn->get_tcp_out_stream(); +@@ -2007,13 +1986,12 @@ void Server::human_created(IGameManagerP + // anyway. + for (m = 0; m < connections.length() && m != n; m++) { + char* fullName = cn->get_full_client_name(); +- ostrstream str; +- str << fullName << " has joined the game" << ends; ++ stringstream str; ++ str << fullName << " has joined the game"; + delete fullName; + + OutStreamP out = cn->get_udp_out_stream(); +- XETP::send_arena_message(out,timeMS,str.str()); +- delete str.str(); ++ XETP::send_arena_message(out,timeMS,str.str().c_str()); + } + cn->creation_message_sent(); + } +@@ -2101,13 +2079,12 @@ void Server::delete_dead_connections(IGa + // Give the connection some slack when it is first starting up. + turn - cn->get_start_turn() >= MINIMUM_CUTOFF) { + char* fullName = cn->get_full_client_name(); +- ostrstream str; ++ stringstream str; + str << fullName + << " has not responded in " +- << diff << " turns. Disconnect." << ends; +- message(str.str()); ++ << diff << " turns. Disconnect."; ++ message(str.str().c_str()); + delete fullName; +- delete str.str(); + tooOld = True; + } + } +@@ -2147,11 +2124,10 @@ void Server::send_pings(Boolean turnWind + diff == NO_ACTIVITY_WARN_2 || + diff == NO_ACTIVITY_WARN_3) { + if (echoPingPong) { +- ostrstream str; ++ stringstream str; + str << "Haven't heard from " << cn->get_client_name() +- << " in " << diff << " turns, sending PING." << ends; +- message(str.str()); +- delete str.str(); ++ << " in " << diff << " turns, sending PING."; ++ message(str.str().c_str()); + } + XETP::send_ping(cn->get_udp_out_stream()); + } +@@ -2311,7 +2287,11 @@ void Server::check_send_object_and_follo + for (m = 0; m < followers.length(); m++) { + PhysicalP q = (PhysicalP)followers.get(m); + netData = q->get_net_data(); +- assert(!netData->get_sent_flag()); ++ // This line was aborting network games, often in the pound scenario. ++ // Without it, the server seems to continue without error. ++ // I tried replacing it with a warning, but there is so much of it ++ // that it is nearly impossible to see anything else. -Brandon ++// assert(!netData->get_sent_flag()); + netData->set_sent_flag(True); + } + +@@ -2713,9 +2693,9 @@ void Server::_error(const char *msg) { + // Careful to set the propagate flag to False so the message doesn't get + // sent to the clients. + if (errorLocator) { +- ostrstream str2; +- str2 << "SERVER: " << msg << ends; +- errorLocator->arena_message_enq(str2.str(),NULL,ROLE_FAILED_TIME,False); ++ stringstream str2; ++ str2 << "SERVER: " << msg; ++ errorLocator->arena_message_enq(Utils::strdup(str2.str().c_str()),NULL,ROLE_FAILED_TIME,False); + // Don't delete str2.str(), give memory to the Locator. + + // Could do a regular message_enq(), but would have to deal with the +@@ -2728,10 +2708,9 @@ void Server::_error(const char *msg) { + void Server::display_chat_message(LocatorP l,const char* sender, + const char* msg) { + // Log the chat message, then let Role handle it. +- strstream logMsg; +- logMsg << '<' << sender << '>' << msg << ends; +- message(logMsg.str()); +- delete logMsg.str(); ++ stringstream logMsg; ++ logMsg << '<' << sender << '>' << msg; ++ message(logMsg.str().c_str()); + + Role::display_chat_message(l,sender,msg); + } +@@ -2851,12 +2830,11 @@ void Server::accept_connection(IGameMana + udpAddr->sin_port = htons(udpPort); + + // Log the connection. +- strstream msg; ++ stringstream msg; + msg << clientName << + " connected (TCP port " << ntohs(tcpAddr.sin_port) << +- ", UDP port " << udpPort << ")" << ends; +- message(msg.str()); +- delete(msg.str()); ++ ", UDP port " << udpPort << ")"; ++ message(msg.str().c_str()); + + Connection* cn = + new Connection(this,errorLocator, +@@ -2874,7 +2852,7 @@ void Server::accept_connection(IGameMana + XETP::send_reset(out,manager->get_game_style_type()); + + // Say hello to the new client. +- ostrstream greeting; ++ stringstream greeting; + greeting << "Welcome to " << hostName << "."; + + if (get_humans_num() == 1) { +@@ -2884,10 +2862,8 @@ void Server::accept_connection(IGameMana + greeting << " There are now " + << get_humans_num() << " players."; + } +- greeting << ends; + int timeMS = quantaToMS(UI_ARENA_MESSAGE_TIME,manager); +- XETP::send_arena_message(out,timeMS,greeting.str()); +- delete greeting.str(); ++ XETP::send_arena_message(out,timeMS,greeting.str().c_str()); + + manager->humans_num_incremented(); + } +@@ -2918,18 +2894,16 @@ void Server::delete_connection(IGameMana + Connection* cm = get_connection(m); + + char* fullName = cn->get_full_client_name(); +- ostrstream str; ++ stringstream str; + str << fullName << " has disconnected"; + if (intel) { + str << ", " << kills << " human kills"; + } +- str << ends; + XETP::send_arena_message(cm->get_udp_out_stream(), +- timeMS,str.str()); ++ timeMS,str.str().c_str()); + + + delete fullName; +- delete str.str(); + } + } + +@@ -3262,8 +3236,8 @@ int Server::find_connection(const IntelI + void Server::send_udp_server_pong(IGameManager* manager,LocatorP locator, + CMN_SOCKET udpSock, + CMN_SOCKADDR_IN* destAddr) { +- static char* unknownString = ""; +- static char* serverString = ""; ++ static const char* unknownString = ""; ++ static const char* serverString = ""; + + + // Temporary stream. +Index: xevil-2.02r2/cmn/role.h +=================================================================== +--- xevil-2.02r2.orig/cmn/role.h ++++ xevil-2.02r2/cmn/role.h +@@ -539,7 +539,7 @@ class Server : public Role { + + + public: +- Server(Boolean localHuman,char *portName,LocatorP); ++ Server(Boolean localHuman,const char *portName,LocatorP); + /* EFFECTS: Create a server that listens for connections on given port. + If NULL is passed in, use XETP::DEFAULT_PORT. */ + +Index: xevil-2.02r2/cmn/streams.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/streams.cpp ++++ xevil-2.02r2/cmn/streams.cpp +@@ -31,12 +31,13 @@ + #include "utils.h" + #include "neth.h" // needed for recv, send, recvfrom, sendto + +-#include ++#include + + #include "streams.h" + #include "xetp.h" // yuck, need this for XETP::versionStr + + ++using namespace std; + + Checksum GenericStream::compute_checksum(u_char *data,int len) { + Checksum c = 0; +@@ -205,7 +206,7 @@ Boolean NetOutStream::alive() { + + + +-Boolean NetOutStream::write(void *buf,int size) { ++Boolean NetOutStream::write(const void *buf,int size) { + if (!isAlive) { + return False; + } +@@ -518,7 +519,7 @@ void UDPOutStream::flush() { + + + +-Boolean UDPOutStream::write(void *buf,int size) { ++Boolean UDPOutStream::write(const void *buf,int size) { + if (!isAlive) { + return False; + } +Index: xevil-2.02r2/cmn/streams.h +=================================================================== +--- xevil-2.02r2.orig/cmn/streams.h ++++ xevil-2.02r2/cmn/streams.h +@@ -97,7 +97,7 @@ class OutStream : public GenericStream { + public: + OutStream(Boolean ownSock) : GenericStream(ownSock) {} + +- virtual Boolean write(void *buf,int size) = 0; ++ virtual Boolean write(const void *buf,int size) = 0; + /* EFFECTS: Write size number of bytes into buf. Return True if + successful. */ + +@@ -171,7 +171,7 @@ public: + + virtual Boolean alive(); + +- virtual Boolean write(void *buf,int size); ++ virtual Boolean write(const void *buf,int size); + + virtual void write_char(u_char); + +@@ -253,7 +253,7 @@ public: + + virtual void done_packet(); + +- virtual Boolean write(void *buf,int size); ++ virtual Boolean write(const void *buf,int size); + + void flush(); + +Index: xevil-2.02r2/cmn/utils.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/utils.cpp ++++ xevil-2.02r2/cmn/utils.cpp +@@ -30,16 +30,16 @@ + + // Include Files + #include "stdafx.h" +-#include ++#include + #include + #include + #include +-#include ++#include + #if WIN32 + #include + #endif + #if X11 +-#include ++#include + #endif + + #ifdef WIN32 +@@ -422,10 +422,8 @@ const char* Utils::game_style_to_string( + + + char* Utils::get_OS_info() { +- ostrstream ret; +- +- + #ifdef WIN32 ++ stringstream ret; + OSVERSIONINFO osInfo; + osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + Boolean set = False; +@@ -465,12 +463,11 @@ char* Utils::get_OS_info() { + Utils::strcmp(osInfo.szCSDVersion," ")) { + ret << '(' << osInfo.szCSDVersion << ')'; + } +- ret << ends; + } + } + + if (!set) { +- ret << "Unknown Win32" << ends; ++ ret << "Unknown Win32"; + } + #endif + +@@ -494,20 +491,15 @@ char* Utils::get_OS_info() { + if (buffer[strLen - 1] == '\n') { + buffer[strLen - 1] = '\0'; + } +- ret << buffer << ends; +- set = True; ++ return strdup(buffer); + } + } + pclose(fp); + } + +- if (!set) { +- ret << "Unknown UNIX" << ends; +- } ++ return strdup("Unknown UNIX"); + #endif + +- +- return ret.str(); + } + + +@@ -605,7 +597,7 @@ void PtrList::write(OutStreamP out) cons + // Not tested. + out->write_int(len); + for (int n = 0; n < len; n++) { +- out->write_int((int)data[n]); ++ out->write_int((long)data[n]); + } + } + +@@ -761,7 +753,7 @@ public: + + + private: +- Bucket* HashTable::_get(int &index,void* key); ++ Bucket* _get(int &index,void* key); + /* MODIFIES: index */ + /* EFFECTS: Internal helper function. Return the Bucket containing key + or NULL if not found. Set index to the bucket list for key whether +@@ -944,7 +936,7 @@ Bucket* HashTable::_get(int &index,void* + // Pretty crappy hash function, I know. + // Careful if bucketsNum is a power of 2. + int HashTable::defaultHash(void* key,int bucketsNum) { +- return ((unsigned int)key) % bucketsNum; ++ return ((unsigned long)key) % bucketsNum; + } + + +@@ -1024,7 +1016,7 @@ void DebugInfo::print(const char *str) { + #endif + + #if X11 +- cout << str << endl; ++ std::cout << str << std::endl; + #endif + } + +Index: xevil-2.02r2/cmn/utils.h +=================================================================== +--- xevil-2.02r2.orig/cmn/utils.h ++++ xevil-2.02r2/cmn/utils.h +@@ -98,11 +98,11 @@ extern "C" { + #define MSEC_PER_CLOCK (1.0e3 / CLOCKS_PER_SEC) + #endif + +-#ifndef max +-#define max(a,b) (ab ? b : a) ++#ifndef MIN ++#define MIN(a,b) (a>b ? b : a) + #endif + + #if X11 +@@ -159,7 +159,7 @@ typedef OutStream *OutStreamP; + + typedef int GameStyleType; + // Possible values of GameStyleType. +-enum {SCENARIOS,LEVELS_ONLY,KILL,DUEL,EXTENDED,TRAINING,LEVELS}; ++enum {SCENARIOS,LEVELS_ONLY,KILL,DUEL,EXTENDED,TRAINING,LEVELS,NUM_GAME_STYLES}; + + + +@@ -237,13 +237,13 @@ class Utils { + /* EFFECTS: Wrapper for C library strcmp(). Return 0 if strings are the + same. */ + +- static char* strchr(const char* cs,int c) ++ static const char* strchr(const char* cs,int c) + {return ::strchr(cs,c);} + +- static char* strrchr(const char* cs,int c) ++ static const char* strrchr(const char* cs,int c) + {return ::strrchr(cs,c);} + +- static char* strstr(const char* cs,const char* ct) ++ static const char* strstr(const char* cs,const char* ct) + {return ::strstr(cs,ct);} + + static void strcpy(char* s,const char* ct) +Index: xevil-2.02r2/cmn/world.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/world.cpp ++++ xevil-2.02r2/cmn/world.cpp +@@ -35,7 +35,7 @@ + #endif + + // Include Files. +-#include ++#include + + #include "utils.h" + #include "coord.h" +@@ -48,6 +48,7 @@ + // For PhysMover. + #include "actual.h" + ++using namespace std; + + // Defines. + #define HANGING_PERCENT 0.40 // The % of the edge hanging off the corner. +Index: xevil-2.02r2/cmn/xetp.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/xetp.cpp ++++ xevil-2.02r2/cmn/xetp.cpp +@@ -29,9 +29,9 @@ + + #include "stdafx.h" + +-#include ++#include + #if X11 +-#include ++#include + #endif + #if WIN32 + #include +@@ -53,6 +53,8 @@ + #include "xetp.h" + + ++using namespace std; ++ + + void XETP::check_sizes() { + XETPBasic::check_sizes(); +@@ -159,7 +161,7 @@ void XETP::send_objects(OutStreamP out,c + for (n = 0; n < physicals.length(); n++) { + PhysicalP p = (PhysicalP)physicals.get(n); + // computing object_length twice, but who cares. +- _send_object(out,p,turn,(TickType)tickTypes.get(n), ++ _send_object(out,p,turn,(long)tickTypes.get(n), + compute_object_length(p)); + } + +@@ -274,7 +276,7 @@ void XETP::send_rooms_known(OutStreamP o + + + +-void XETP::send_message(OutStreamP out,char *msg) { ++void XETP::send_message(OutStreamP out,const char *msg) { + assert(msg); + u_int len = strlen(msg); + +@@ -293,7 +295,7 @@ void XETP::send_message(OutStreamP out,c + + + +-void XETP::send_arena_message(OutStreamP out,int time,char *msg) { ++void XETP::send_arena_message(OutStreamP out,int time,const char *msg) { + assert(msg); + u_int len = sizeof(int) + // time + strlen(msg); // string body +Index: xevil-2.02r2/cmn/xetp.h +=================================================================== +--- xevil-2.02r2.orig/cmn/xetp.h ++++ xevil-2.02r2/cmn/xetp.h +@@ -83,9 +83,9 @@ public: + static void send_rooms_known(OutStreamP,const Rooms &, + int worldVersion,Boolean *map); + +- static void send_message(OutStreamP,char *msg); ++ static void send_message(OutStreamP,const char *msg); + +- static void send_arena_message(OutStreamP,int timeMS,char *msg); ++ static void send_arena_message(OutStreamP,int timeMS,const char *msg); + + static void send_command(OutStreamP,const IntelId &,ITcommand); + +Index: xevil-2.02r2/cmn/xetp_basic.cpp +=================================================================== +--- xevil-2.02r2.orig/cmn/xetp_basic.cpp ++++ xevil-2.02r2/cmn/xetp_basic.cpp +@@ -33,7 +33,7 @@ + #include "xetp_basic.h" + + +-char *XETPBasic::versionStr = "XETP1.00"; ++const char *XETPBasic::versionStr = "XETP1.00"; + // 0.10 released with special RedHat version + // 0.12 for 2.0b5 + // 0.15 for 2.0b6 +Index: xevil-2.02r2/cmn/xetp_basic.h +=================================================================== +--- xevil-2.02r2.orig/cmn/xetp_basic.h ++++ xevil-2.02r2/cmn/xetp_basic.h +@@ -52,7 +52,7 @@ public: + // All values are big-endian + enum {HEADER_LENGTH = 3}; // 8 + enum {VERSION_LENGTH = 8}; // streams.h depends on this value. +- static char *versionStr; ++ static const char *versionStr; + + // The ':' syntax gives the size in bytes of each component. :String means + // use Utils::string_read(), Utils::string_write(), etc. +Index: xevil-2.02r2/config.mk +=================================================================== +--- xevil-2.02r2.orig/config.mk ++++ xevil-2.02r2/config.mk +@@ -83,7 +83,10 @@ COMPRESS = gzip + #### Attempt to guesss the host architecture using the HOSTYPE and hostype + # variables. Then call self with the architecture name. + default: +- @if [ $${HOSTTYPE-bob} != bob ] ; then \ ++# FORCEHOSTTYPE is used by debian-linux ++ @if [ $${FORCEHOSTTYPE-bob} != bob ]; then \ ++ archit=$$FORCEHOSTTYPE; \ ++ elif [ $${HOSTTYPE-bob} != bob ] ; then \ + archit=$$HOSTTYPE ; \ + elif [ $${hosttype-bob} != bob ] ; then \ + archit=$$hosttype ; \ +@@ -252,6 +255,15 @@ LIBS="-lXpm -lX11 -lm" \ + OBJ_DIR=$(DEPTH)/x11/REDHAT_LINUX PCKG_NAME="redhatlinux" \ + $(TARGETS) + ++#For debian-linux ++debian-linux: ++ @$(MAKE) CC="g++" \ ++CFLAGS="-DUSE_RANDOM -DXEVIL_KEYSET=UIlinux -DUSE_UINT_NET_LENGTH" \ ++INCL_DIRS="-I/usr/X11R6/include" \ ++LIBS_DIRS="-L/usr/X11R6/lib" \ ++LIBS="-lXpm -lX11 -lm" \ ++$(TARGETS) ++ + # use static + # Should add -DXEVIL_KEYSET=UIlinux + i386-linux-old: +Index: xevil-2.02r2/makefile +=================================================================== +--- xevil-2.02r2.orig/makefile ++++ xevil-2.02r2/makefile +@@ -42,9 +42,9 @@ ALL_OBJS = $(OBJ_DIR)/role.o $(OBJ_DIR)/ + $(OBJ_DIR)/ui_cmn.o $(OBJ_DIR)/l_agreement_dlg.o $(OBJ_DIR)/viewport.o + + +-xevil: $(OBJ_DIR)/xevil $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z ++#xevil: $(OBJ_DIR)/xevil $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z + #xevil: $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z +-#xevil: $(OBJ_DIR)/xevil ++xevil: $(OBJ_DIR)/xevil + + + # Build the xevil executable. +@@ -59,7 +59,7 @@ $(OBJ_DIR)/xevil:: + cd $(DEPTH)/cmn; $(MAKE) + cd $(DEPTH)/x11; $(MAKE) + $(CC) $(LINK_FLAGS) $(LINK_OPT) $(LIBS_DIRS) -o $(OBJ_DIR)/xevil $(ALL_OBJS) $(LIBS) +- $(STRIP) $(OBJ_DIR)/xevil ++# $(STRIP) $(OBJ_DIR)/xevil + + # Could also include serverping in the distribution + $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z:: +@@ -96,8 +96,8 @@ workdir: + + ## Remove executables and all junk. + clean: +- /bin/rm -f $(OBJ_DIR)/* core */core +- rmdir $(OBJ_DIR) ++ -/bin/rm -f $(OBJ_DIR)/* core */core ++ -rmdir $(OBJ_DIR) + # /bin/rm -f $(TARGETS) $(OBJS) core test test.o xshow.o xshow + + tildaclean: +Index: xevil-2.02r2/x11/draw.cpp +=================================================================== +--- xevil-2.02r2.orig/x11/draw.cpp ++++ xevil-2.02r2/x11/draw.cpp +@@ -34,6 +34,7 @@ + // in Xvars instead. + #include "viewport.h" + ++using namespace std; + + + // Draw functions for World +@@ -327,7 +328,7 @@ void World::init_x(Xvars &xvars,IXComman + Boolean val = + xvars.load_pixmap(&xdata.blockPixmaps[dpyNum][n], + mask,dpyNum, +- (char**)blocksBits[n]); ++ (const char**)blocksBits[n]); + if (!val) { + cerr << "Failed to load block " << n << endl; + } +@@ -352,7 +353,7 @@ void World::init_x(Xvars &xvars,IXComman + Boolean val = + xvars.load_pixmap(&xdata.posterPixmaps[dpyNum][n], + &xdata.posterMasks[dpyNum][n], +- dpyNum,(char**)posters[n].id); ++ dpyNum,(const char**)posters[n].id); + if (!val) { + cerr << "Failed to load poster " << n << endl; + } +@@ -363,7 +364,7 @@ void World::init_x(Xvars &xvars,IXComman + for (n = 0; n < W_ALL_DOORS_NUM; n++) { + Boolean val = + xvars.load_pixmap(&xdata.doorPixmaps[dpyNum][n],NULL,dpyNum, +- (char**)doorPixmapBits[n]); ++ (const char**)doorPixmapBits[n]); + if (!val) { + cerr << "Failed to load door block " << n << endl; + } +@@ -376,7 +377,7 @@ void World::init_x(Xvars &xvars,IXComman + xvars.load_pixmap(&xdata.moverSquarePixmaps[dpyNum][n], + &xdata.moverSquareMasks[dpyNum][n], + dpyNum, +- (char**)moverSquarePixmapBits[n]); ++ (const char**)moverSquarePixmapBits[n]); + if (!val) { + cerr << "Failed to mover square " << n << endl; + } +@@ -400,7 +401,7 @@ void World::init_x(Xvars &xvars,IXComman + xvars.load_pixmap(&xdata.moverPixmaps[dpyNum][n], + &xdata.moverMasks[dpyNum][n], + dpyNum, +- (char**)moverPixmapBits[n]); ++ (const char**)moverPixmapBits[n]); + if (!val) { + cerr << "Failed to load mover " << n << endl; + } +@@ -411,7 +412,7 @@ void World::init_x(Xvars &xvars,IXComman + for (n = 0; n < W_ALL_BACKGROUNDS_NUM; n++) { + Boolean val = + xvars.load_pixmap(&xdata.backgroundPixmaps[dpyNum][n],NULL,dpyNum, +- (char**)backgrounds[n].id); ++ (const char**)backgrounds[n].id); + if (!val) { + cerr << "Failed to load background " << n << endl; + } +@@ -422,7 +423,7 @@ void World::init_x(Xvars &xvars,IXComman + for (n = 0; n < W_ALL_OUTSIDES_NUM; n++) { + Boolean val = + xvars.load_pixmap(&xdata.outsidePixmaps[dpyNum][n],NULL,dpyNum, +- (char**)outsides[n].id); ++ (const char**)outsides[n].id); + if (!val) { + cerr << "Failed to load outside " << n << endl; + } +@@ -689,7 +690,7 @@ void Locator::init_x(Xvars &xvars,IXComm + assert(tickPixmapBits[tt][hp] != PH_AUTO_GEN); + xvars.load_pixmap(&xdata.tickPixmaps[dpyNum][tt][hp], + &xdata.tickMasks[dpyNum][tt][hp], +- dpyNum,(char**)tickPixmapBits[tt][hp]); ++ dpyNum,(const char**)tickPixmapBits[tt][hp]); + } + } + } +@@ -1020,7 +1021,7 @@ void Fire::init_x(Xvars &xvars,IXCommand + for (dpyNum = 0; dpyNum < xvars.dpyMax; dpyNum++) { + Boolean val = xvars.load_pixmap(&xdata.pixmap[dpyNum], + &xdata.mask[dpyNum], +- dpyNum,(char**)fireBits); ++ dpyNum,(const char**)fireBits); + if (!val) { + cerr << "Failed to load fire graphics." << endl; + } +@@ -1292,7 +1293,7 @@ void Moving::init_x(Xvars &xvars,IXComma + Boolean val = + xvars.load_pixmap(&movingXdata.pixmaps[dpyNum][n][m], + &movingXdata.masks[dpyNum][n][m], +- dpyNum,(char**)mc.pixmapBits[n][m]); ++ dpyNum,(const char**)mc.pixmapBits[n][m]); + if (!val) { + cerr << "load_pixmap() failed for " + << mc.physicalContext.className +Index: xevil-2.02r2/x11/l_agreement_dlg.cpp +=================================================================== +--- xevil-2.02r2.orig/x11/l_agreement_dlg.cpp ++++ xevil-2.02r2/x11/l_agreement_dlg.cpp +@@ -31,7 +31,6 @@ extern "C" { + #include + } + +-#include + + #include "xdata.h" + #include "panel.h" +Index: xevil-2.02r2/x11/main.cpp +=================================================================== +--- xevil-2.02r2.orig/x11/main.cpp ++++ xevil-2.02r2/x11/main.cpp +@@ -25,6 +25,7 @@ + #include "utils.h" + + extern "C" { ++#include + #include + + #ifdef OPENWOUND_XOS_STRLEN_HACK +@@ -33,13 +34,13 @@ extern "C" { + #include + } + +-#include ++#include + + #include "utils.h" + #include "neth.h" + #include "game.h" + +- ++GameP g_game; + + class TurnStarter: public ITurnStarter { + public: +@@ -68,6 +69,7 @@ int main(int argc, char **argv) { + Utils::seed_random(); + + GameP game = new Game(&argc,argv); ++ g_game = game; + + // assert (clock() != -1); + +Index: xevil-2.02r2/x11/makefile +=================================================================== +--- xevil-2.02r2.orig/x11/makefile ++++ xevil-2.02r2/x11/makefile +@@ -72,7 +72,7 @@ $(OBJ_DIR)/serverping.o: serverping.cpp + $(CC) $(DEBUG_OPT) $(ALL_CFLAGS) $(ALL_INCL_DIRS) -o $(OBJ_DIR)/serverping.o -c serverping.cpp + + $(OBJ_DIR)/serverping:: $(OBJ_DIR)/serverping.o +- $(CC) $(LINK_FLAGS) $(LINK_OPT) $(LIBS_DIRS) -o $(OBJ_DIR)/serverping $(OBJ_DIR)/serverping.o $(OBJ_DIR)/utils.o $(OBJ_DIR)/xetp_basic.o $(OBJ_DIR)/streams.o $(OBJ_DIR)/id.o $(LIBS) ++ $(CC) $(LINK_FLAGS) $(LINK_OPT) $(LIBS_DIRS) -o $(OBJ_DIR)/serverping $(OBJ_DIR)/serverping.o $(OBJ_DIR)/utils.o $(OBJ_DIR)/xetp_basic.o $(OBJ_DIR)/streams.o $(OBJ_DIR)/id.o -lm + # $(STRIP) $(OBJ_DIR)/serverping + + +Index: xevil-2.02r2/x11/panel.cpp +=================================================================== +--- xevil-2.02r2.orig/x11/panel.cpp ++++ xevil-2.02r2/x11/panel.cpp +@@ -31,13 +31,14 @@ extern "C" { + #include + #include + } +-#include +-#include ++#include ++#include + + #include "utils.h" + #include "xdata.h" + #include "panel.h" + ++using namespace std; + + #define PANEL_BORDER 1 + #define PANEL_MARGAIN 2 +@@ -311,15 +312,14 @@ Boolean WritePanel::process_event(int dp + + + void WritePanel::update_message() { +- ostrstream tmp; ++ stringstream tmp; + if (active) { +- tmp << prompt << value << "_" << ends; ++ tmp << prompt << value << "_"; + } + else { +- tmp << prompt << value << ends; ++ tmp << prompt << value; + } +- set_message(tmp.str()); +- delete tmp.str(); ++ set_message(tmp.str().c_str()); + } + + +@@ -524,9 +524,8 @@ void ChatPanel::update_message() { + return; + } + +- ostrstream tmp; +- tmp << "CHAT <<" << value << "\nEnter to send, Esc to cancel." << ends; +- TextPanel::set_message(tmp.str()); +- delete tmp.str(); ++ stringstream tmp; ++ tmp << "CHAT <<" << value << "\nEnter to send, Esc to cancel."; ++ TextPanel::set_message(tmp.str().c_str()); + } + +Index: xevil-2.02r2/x11/serverping.cpp +=================================================================== +--- xevil-2.02r2.orig/x11/serverping.cpp ++++ xevil-2.02r2/x11/serverping.cpp +@@ -25,14 +25,15 @@ + // code and should be reasonably easy to compile on Windows. + + +-#include +-#include ++#include ++#include + #include "utils.h" + #include "streams.h" + #include "xetp_basic.h" + #include "neth.h" + #include "id.h" + ++using namespace std; + + + class ServerPing { +@@ -113,7 +114,7 @@ ServerPing::ServerPing(int argc,char** a + + + char* sString = argv[argc - 1]; +- char* port = Utils::strchr(sString,':'); ++ const char* port = Utils::strchr(sString,':'); + // server:port + if (port) { + serverName = new char[port - sString + 1]; +@@ -140,10 +141,9 @@ ServerPing::ServerPing(int argc,char** a + error("Error opening client UDP socket."); + } + +- ostrstream str; +- str << "Looking up IP address for server " << serverName << ends; +- message(str.str()); +- delete str.str(); ++ stringstream str; ++ str << "Looking up IP address for server " << serverName; ++ message(str.str().c_str()); + + // Create server address. + memset((void *)&serverAddr,'\0',sizeof(serverAddr)); +@@ -171,10 +171,9 @@ ServerPing::ServerPing(int argc,char** a + client.sin_addr.s_addr = htonl(INADDR_ANY); + client.sin_port = htons((u_short)clientPort); + if (bind(udpSock,(CMN_SOCKADDR *)&client,sizeof(client)) < 0) { +- ostrstream str; +- str << "Could not bind local UDP port " << clientPort << ends; +- error(str.str()); +- delete str.str(); ++ stringstream str; ++ str << "Could not bind local UDP port " << clientPort; ++ error(str.str().c_str()); + return; + } + +@@ -197,11 +196,10 @@ void ServerPing::go() { + // Send "count" number of SERVER_PINGs. + for (int tries = 0; tries < count; tries++) { + // Send the ping. +- ostrstream msg; ++ stringstream msg; + msg << "Sending XETP::SERVER_PING to " +- << serverName << ':' << serverPort << ends; +- message(msg.str()); +- delete msg.str(); ++ << serverName << ':' << serverPort; ++ message(msg.str().c_str()); + XETPBasic::send_server_ping(udpOut); + // Don't buffer the ping. + udpOut->flush(); +@@ -248,11 +246,10 @@ void ServerPing::go() { + } + + // If we get here, we failed to reach the server. +- ostrstream msg; ++ stringstream msg; + msg << "No return from " << serverName << ':' << serverPort << " after " +- << count << " tries." << ends; +- error(msg.str()); +- delete msg.str(); ++ << count << " tries."; ++ error(msg.str().c_str()); + } + + +@@ -271,12 +268,9 @@ void ServerPing::error(const char* msg) + + + void ServerPing::error(const char* msg1,const char* msg2) { +- ostrstream str; +- str << msg1 << msg2 << ends; +- error(str.str()); +- +- // Will never get here, but WTF. +- delete str.str(); ++ stringstream str; ++ str << msg1 << msg2; ++ error(str.str().c_str()); + } + + +Index: xevil-2.02r2/x11/ui.cpp +=================================================================== +--- xevil-2.02r2.orig/x11/ui.cpp ++++ xevil-2.02r2/x11/ui.cpp +@@ -30,6 +30,7 @@ + #include "utils.h" + extern "C" { + #include ++#include + #include + #ifdef OPENWOUND_XOS_STRLEN_HACK + #define _strings_h +@@ -40,8 +41,8 @@ extern "C" { + #include + } + +-#include +-#include ++#include ++#include + + #include "coord.h" + #include "area.h" +@@ -59,6 +60,7 @@ extern "C" { + #include "panel.h" + #include "viewport.h" + ++using namespace std; + + // Defines + #define DEFAULT_BIG_FONT_NAME "-*-helvetica-*-r-*-*-18-*-*-*-*-*-*-*" +@@ -226,20 +228,6 @@ Ui::Ui(int *agc, char **agv, WorldP w, L + for (int d = 0; d < xvars.dpyMax; d++) { + xvars.alloc_named_color(d,"steelblue"); + } +- +- // Run the license agreement. +- // Note: The license agreement will not be run if the user runs +- // "xevil -server -no_ui". +- // Must be after init_x(). +- Boolean reduceDraw = Viewport::get_reduce_draw(); +- Boolean accepted = +- LAgreement::check_accepted(largeViewport,smoothScroll,reduceDraw, +- xvars,0,argc,argv); +- Viewport::set_reduce_draw(reduceDraw); +- if (!accepted) { +- // Should probably let game.cpp call exit. +- exit(1); +- } + + // Ick, this should be in init_x(), but we need to call init_x() before + // running the License Agreement to get this information. +@@ -461,21 +449,27 @@ void Ui::key_event(int dpyNum,int keycod + } + } + +- if (down) { +- // Restart game if space pressed. +- // This doesn't always work, the otherInput flag might get cleared +- // before it is used. +- if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_space)) { +- otherInput = True; ++ // If function keys are assigned to movement, weapon or item functions, ++ // then this code will not get executed. ++ if (down && !found) { ++ // Pause Game ++ if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_F1)) { ++ settingsChanges |= UIpause; ++ settings.pause = True; + } +- +- if (!found) { +- // Undocumented pause key feature. +- // Don't do pause if XK_F1 is used for something else. +- if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_F1)) { +- settingsChanges |= UIpause; +- settings.pause = True; +- } ++ // New Game ++ if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_F2)) { ++ settingsChanges |= UInewGame; ++ } ++ // Change game style ++ if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_F3)) { ++ settingsChanges |= UIstyle; ++ settings.style = (settings.style + 1) % NUM_GAME_STYLES; ++ ++ // Avoid the LEVELS_ONLY option. There was no button before ++ // I got here. Avoiding the ability to set it until I ++ // discover why ++ settings.style += (settings.style == LEVELS_ONLY) ? 1 : 0; + } + } + } +@@ -865,7 +859,7 @@ void Ui::pre_clock() { + char *msg; + if (msg = locator->message_deq()) { + set_message(msg); +- delete msg; ++ delete [] msg; + messageTimer.set(MESSAGE_TIME); + } + } +@@ -930,7 +924,7 @@ void Ui::menu_enemies_refill_CB(void* va + UiP ui = (UiP)closure; + ui->settingsChanges |= UIenemiesRefill; + // SGI compiler says you can't cast void* to Boolean. +- Boolean val = (Boolean)(int)value; ++ Boolean val = (Boolean)(long)value; + ui->settings.enemiesRefill = val; + } + +@@ -939,7 +933,7 @@ void Ui::menu_enemies_refill_CB(void* va + void Ui::menu_controls_CB(void* value,Viewport* vPort,void* closure) { + UiP ui = (UiP)closure; + int dpyNum = vPort->get_dpy_num(); +- Boolean val = (Boolean)(int)value; ++ Boolean val = (Boolean)(long)value; + if (val) { + XMapWindow(ui->xvars.dpy[dpyNum],ui->xdata.controls[dpyNum]); + } +@@ -955,13 +949,13 @@ void Ui::menu_learn_controls_CB(void* va + Viewport* vPort,void* closure) { + UiP ui = (UiP)closure; + int dpyNum = vPort->get_dpy_num(); +- Boolean active = (Boolean)(int)value; ++ Boolean active = (Boolean)(long)value; + + if (active) { + ui->lControls[dpyNum].input = ui->lControls[dpyNum].key = + ui->lControls[dpyNum].which = 0; + +- ostrstream str; ++ stringstream str; + str << "There are 2 sets of controls for the players on the right and" + << "\n" + << "left sides of the keyboard, respectively." << "\n" +@@ -979,10 +973,9 @@ void Ui::menu_learn_controls_CB(void* va + << " player enter the " + << (ui->lControls[dpyNum].which ? "second" : "first") + << " key for <" << ui->keysNames[ui->lControls[dpyNum].key] +- << ">." << ends; ++ << ">."; + +- ui->learnControls[dpyNum]->set_message(str.str()); +- delete str.str(); ++ ui->learnControls[dpyNum]->set_message(str.str().c_str()); + XMapWindow(ui->xvars.dpy[dpyNum],ui->xdata.learnControls[dpyNum]); + } + else { +@@ -994,7 +987,7 @@ void Ui::menu_learn_controls_CB(void* va + + void Ui::menu_scenarios_CB(void* value,Viewport*,void* closure) { + UiP ui = (UiP)closure; +- Boolean val = (Boolean)(int)value; ++ Boolean val = (Boolean)(long)value; + if (val) { + ui->settingsChanges |= UIstyle; + ui->settings.style = SCENARIOS; +@@ -1005,7 +998,7 @@ void Ui::menu_scenarios_CB(void* value,V + + void Ui::menu_levels_CB(void* value,Viewport*,void* closure) { + UiP ui = (UiP)closure; +- Boolean val = (Boolean)(int)value; ++ Boolean val = (Boolean)(long)value; + if (val) { + ui->settingsChanges |= UIstyle; + ui->settings.style = LEVELS; +@@ -1016,7 +1009,7 @@ void Ui::menu_levels_CB(void* value,View + + void Ui::menu_kill_CB(void* value,Viewport*,void* closure) { + UiP ui = (UiP)closure; +- Boolean val = (Boolean)(int)value; ++ Boolean val = (Boolean)(long)value; + if (val) { + ui->settingsChanges |= UIstyle; + ui->settings.style = KILL; +@@ -1027,7 +1020,7 @@ void Ui::menu_kill_CB(void* value,Viewpo + + void Ui::menu_duel_CB(void* value,Viewport*,void* closure) { + UiP ui = (UiP)closure; +- Boolean val = (Boolean)(int)value; ++ Boolean val = (Boolean)(long)value; + if (val) { + ui->settingsChanges |= UIstyle; + ui->settings.style = DUEL; +@@ -1038,7 +1031,7 @@ void Ui::menu_duel_CB(void* value,Viewpo + + void Ui::menu_extended_CB(void* value,Viewport*,void* closure) { + UiP ui = (UiP)closure; +- Boolean val = (Boolean)(int)value; ++ Boolean val = (Boolean)(long)value; + if (val) { + ui->settingsChanges |= UIstyle; + ui->settings.style = EXTENDED; +@@ -1049,7 +1042,7 @@ void Ui::menu_extended_CB(void* value,Vi + + void Ui::menu_training_CB(void* value,Viewport*,void* closure) { + UiP ui = (UiP)closure; +- Boolean val = (Boolean)(int)value; ++ Boolean val = (Boolean)(long)value; + if (val) { + ui->settingsChanges |= UIstyle; + ui->settings.style = TRAINING; +@@ -1070,7 +1063,7 @@ void Ui::menu_quanta_CB(void* value,View + void Ui::menu_cooperative_CB(void* value,Viewport*,void* closure) { + UiP ui = (UiP)closure; + ui->settingsChanges |= UIcooperative; +- Boolean val = (Boolean)(int)value; ++ Boolean val = (Boolean)(long)value; + ui->settings.cooperative = val; + } + +@@ -1079,7 +1072,7 @@ void Ui::menu_cooperative_CB(void* value + void Ui::menu_help_CB(void* value,Viewport* vPort,void* closure) { + UiP ui = (UiP)closure; + int dpyNum = vPort->get_dpy_num(); +- Boolean active = (Boolean)(int)value; ++ Boolean active = (Boolean)(long)value; + + if (active) { + XMapWindow(ui->xvars.dpy[dpyNum],ui->xdata.help[dpyNum]); +@@ -1094,7 +1087,7 @@ void Ui::menu_help_CB(void* value,Viewpo + void Ui::status_weapon_CB(void* value,Viewport* vPort,void*) { + // Some mouse controls. + // UiP ui = (UiP)closure; +- int button = (int)value; ++ long button = (long)value; + + switch (button) { + case Button1: +@@ -1113,7 +1106,7 @@ void Ui::status_weapon_CB(void* value,Vi + + void Ui::status_item_CB(void* value,Viewport* vPort,void*) { + // UiP ui = (UiP)closure; +- int button = (int)value; ++ long button = (long)value; + + switch (button) { + case Button1: +@@ -1167,14 +1160,14 @@ void Ui::learn_controls_CB(Panel* panel, + return; + } + +- ostrstream str; ++ stringstream str; + str << (ui->lControls[dpyNum].input ? "Left" : "Right") + << " player: The " + << (ui->lControls[dpyNum].which ? "second" : "first") << " key for <" + << ui->keysNames[ui->lControls[dpyNum].key] << "> is " + << XKeysymToString(XKeycodeToKeysym(ui->xvars.dpy[dpyNum], + event->xkey.keycode,0)) +- << "." << "\n" << "\n"; ++ << ".\n\n"; + ui->keycodes[dpyNum][ui->lControls[dpyNum].input] + [ui->lControls[dpyNum].key][ui->lControls[dpyNum].which] = + event->xkey.keycode; +@@ -1222,21 +1215,18 @@ void Ui::learn_controls_CB(Panel* panel, + << " player enter the " + << (ui->lControls[dpyNum].which ? "second" : "first") + << " key for <" << keysNames[ui->lControls[dpyNum].key] +- << ">." << ends; ++ << ">."; + + // Add message in front of str.str(). +- ostrstream fullStr; ++ stringstream fullStr; + if (ui->lControls[dpyNum].input == UI_KEYS_LEFT) { + fullStr << "You may dismiss this dialog now if you only want to" << "\n" +- << "set the controls for one player." +- << "\n" << "\n"; ++ << "set the controls for one player.\n\n"; + } +- fullStr << str.str() << ends; +- delete str.str(); ++ fullStr << str.str(); + + +- ui->learnControls[dpyNum]->set_message(fullStr.str()); +- delete fullStr.str(); ++ ui->learnControls[dpyNum]->set_message(fullStr.str().c_str()); + + ui->controls_redraw(dpyNum); + } +@@ -1537,7 +1527,7 @@ void Ui::create_help() { + Line::set_text_columns(HELP_COLS); + Page page(NULL,helpMessage); + const PtrList& lines = page.get_lines(); +- ostrstream message; ++ stringstream message; + for (int n = 0; n < lines.length(); n++) { + Line* line = (Line*)lines.get(n); + char* text = line->alloc_text(); +@@ -1545,7 +1535,6 @@ void Ui::create_help() { + message << text << '\n'; + delete [] text; + } +- message << ends; + + + for (int dpyNum = 0; dpyNum < xvars.dpyMax; dpyNum++) { +@@ -1564,10 +1553,8 @@ void Ui::create_help() { + new TextPanel(dpyNum,xvars,xdata.help[dpyNum],pos,size); + assert(help[dpyNum]); + +- help[dpyNum]->set_message(message.str()); ++ help[dpyNum]->set_message(message.str().c_str()); + } // dpyNum +- +- delete message.str(); + } + + +@@ -1621,7 +1608,7 @@ void Ui::controls_redraw(int dpyNum) { + // Loop through all keys. + for (int n = 0; n < UI_KEYS_MAX; n++) { + // String for right side. +- strstream str0; ++ stringstream str0; + str0 << keysNames[n] << ": " << XKeysymToString(keymaps[0][n][0][0]); + if (keymaps[0][n][0][1] && strlen(XKeysymToString(keymaps[0][n][0][1]))) + str0 << ", " << XKeysymToString(keymaps[0][n][0][1]); +@@ -1631,10 +1618,9 @@ void Ui::controls_redraw(int dpyNum) { + && strlen(XKeysymToString(keymaps[0][n][1][1]))) + str0 << ", " << XKeysymToString(keymaps[0][n][1][1]); + } +- str0 << ends; + + // String for left side. +- strstream str1; ++ stringstream str1; + str1 << keysNames[n] << ": " << XKeysymToString(keymaps[1][n][0][0]); + if (keymaps[1][n][0][1] && strlen(XKeysymToString(keymaps[1][n][0][1]))) { + str1 << ", " << XKeysymToString(keymaps[1][n][0][1]); +@@ -1645,7 +1631,6 @@ void Ui::controls_redraw(int dpyNum) { + && strlen(XKeysymToString(keymaps[1][n][1][1]))) + str1 << ", " << XKeysymToString(keymaps[1][n][1][1]); + } +- str1 << ends; + + // Draw key on left side. + if (n != IT_CHAT) { // Chat meaningless for left player. +@@ -1653,16 +1638,14 @@ void Ui::controls_redraw(int dpyNum) { + xvars.fontSize[dpyNum].width, + xvars.font[dpyNum]->max_bounds.ascent + + p * xvars.fontSize[dpyNum].height, +- str1.str(),strlen(str1.str())); ++ str1.str().c_str(),str1.str().length()); + } + // Draw on right side. + XDrawString(xvars.dpy[dpyNum],xdata.controls[dpyNum],xvars.gc[dpyNum], + xvars.fontSize[dpyNum].width * (CONTROLS_COLS / 2 + 1), + xvars.font[dpyNum]->max_bounds.ascent + + (p++) * xvars.fontSize[dpyNum].height, +- str0.str(),strlen(str0.str())); +- delete str0.str(); +- delete str1.str(); ++ str0.str().c_str(),str0.str().length()); + } + p++; + +@@ -1693,7 +1676,7 @@ IViewportInfo* Ui::get_viewport_info() { + + + +-char *Ui::keysNames[UI_KEYS_MAX] = { ++const char *Ui::keysNames[UI_KEYS_MAX] = { + "center", + "right", + "down_right", +@@ -1752,7 +1735,7 @@ ViewportCallback Ui::viewportCallbacks[V + + + +-char* Ui::helpMessage = ++const char* Ui::helpMessage = + "For full instructions, including NETWORK PLAY, see " + "http://www.xevil.com/docs/instructions.html\n" + "\n" +Index: xevil-2.02r2/x11/ui.h +=================================================================== +--- xevil-2.02r2.orig/x11/ui.h ++++ xevil-2.02r2/x11/ui.h +@@ -338,7 +338,7 @@ class Ui: public IDifficultyCallback, + + + // Variables. +- static char *keysNames[UI_KEYS_MAX]; ++ static const char *keysNames[UI_KEYS_MAX]; + + char **argv; // Warning: Exposing the rep. + int argc; +@@ -402,7 +402,7 @@ class Ui: public IDifficultyCallback, + // The callbacks to export to the Viewport. + static ViewportCallback viewportCallbacks[VIEWPORT_CB_NUM]; + +- static char* helpMessage; ++ static const char* helpMessage; + }; + + #endif +Index: xevil-2.02r2/x11/viewport.cpp +=================================================================== +--- xevil-2.02r2.orig/x11/viewport.cpp ++++ xevil-2.02r2/x11/viewport.cpp +@@ -44,8 +44,9 @@ extern "C" { + #include + #include + } +-#include ++#include + ++using namespace std; + + #define TICK_BORDER_WIDTH 5 // border width big enough for a tick mark. + #define TICK_WIDTH 3 +@@ -60,14 +61,14 @@ extern "C" { + #define COL_SHIFT 4 + + // Number of characters across for each menu button. +-#define QUIT_LINE_LENGTH 5 +-#define NEW_GAME_LINE_LENGTH 9 ++#define QUIT_LINE_LENGTH 4 ++#define NEW_GAME_LINE_LENGTH 13 + #define HUMANS_NUM_LINE_LENGTH 9 + #define ENEMIES_NUM_LINE_LENGTH 11 + #define ENEMIES_REFILL_LINE_LENGTH 13 + #define CONTROLS_LINE_LENGTH 13 + #define LEARN_CONTROLS_LINE_LENGTH 12 +-#define STYLE_LINE_LENGTH 11 ++#define STYLE_LINE_LENGTH 16 + #define SCENARIOS_LINE_LENGTH 9 + #define LEVELS_LINE_LENGTH 6 + #define KILL_LINE_LENGTH 16 +@@ -1056,20 +1057,18 @@ void Viewport::set_menu_learn_controls(B + + void Viewport::set_menu_humans_num(int val) { + assert(menusNum > menuHumansNum); +- ostrstream str; +- str << val << ends; +- ((WritePanel *)menus[menuHumansNum])->set_value(str.str()); +- delete str.str(); ++ stringstream str; ++ str << val; ++ ((WritePanel *)menus[menuHumansNum])->set_value(str.str().c_str()); + } + + + + void Viewport::set_menu_enemies_num(int val) { + assert(menusNum > menuEnemiesNum); +- ostrstream str; +- str << val << ends; +- ((WritePanel *)menus[menuEnemiesNum])->set_value(str.str()); +- delete str.str(); ++ stringstream str; ++ str << val; ++ ((WritePanel *)menus[menuEnemiesNum])->set_value(str.str().c_str()); + } + + +@@ -1128,10 +1127,9 @@ void Viewport::set_style_and_role_type(G + + void Viewport::set_quanta(Quanta quanta) { + assert(menusNum > menuQuanta); +- ostrstream str; +- str << quanta << ends; +- ((WritePanel *)menus[menuQuanta])->set_value(str.str()); +- delete str.str(); ++ stringstream str; ++ str << quanta; ++ ((WritePanel *)menus[menuQuanta])->set_value(str.str().c_str()); + } + + +@@ -1144,33 +1142,27 @@ void Viewport::set_cooperative(Boolean v + + + void Viewport::set_humans_playing(int val) { +- ostrstream msg; ++ stringstream msg; + if (val == 1) { +- msg << "1 Human" << ends; ++ msg << "1 Human"; + } + else { +- msg << val << " Humans" << ends; ++ msg << val << " Humans"; + } +- char *msg_str = msg.str(); +- +- humansPlaying->set_message(msg_str); +- delete msg_str; ++ humansPlaying->set_message(msg.str().c_str()); + } + + + + void Viewport::set_enemies_playing(int val) { +- ostrstream msg; ++ stringstream msg; + if (val == 1) { +- msg << "1 Enemy" << ends; ++ msg << "1 Enemy"; + } + else { +- msg << val << " Enemies" << ends; ++ msg << val << " Enemies"; + } +- char *msg_str = msg.str(); +- +- enemiesPlaying->set_message(msg_str); +- delete msg_str; ++ enemiesPlaying->set_message(msg.str().c_str()); + } + + +@@ -1632,7 +1624,7 @@ void Viewport::panel_callback(Panel* pan + // Would be much better to put the radio-button logic in the Panel classes. + if (pClosure->radio) { + // SGI compiler says you can't cast void* to Boolean. +- Boolean bValue = (Boolean)(int)value; ++ Boolean bValue = (Boolean)(long)value; + if (!bValue) { + ((TogglePanel*)panel)->set_value(True); + } +@@ -1701,7 +1693,7 @@ void Viewport::draw() { + pos.y += xvars.fontSize[dpyNum].height; + + for (int n = 0; n < DIFFICULTY_LEVELS_NUM; n++) { +- ostrstream str; ++ stringstream str; + str << "[" << n; + if (n == DIFF_NORMAL) { + str << ",space] "; +@@ -1709,10 +1701,9 @@ void Viewport::draw() { + else { + str << "] "; + } +- str << difficultyLevels[n].name << ends; ++ str << difficultyLevels[n].name; + pos.y += xvars.fontSize[dpyNum].height; +- draw_string(pos,str.str()); +- delete str.str(); ++ draw_string(pos,str.str().c_str()); + } + + XSetForeground(xvars.dpy[dpyNum],xvars.gc[dpyNum], +@@ -1733,7 +1724,7 @@ void Viewport::draw() { + + + +-void Viewport::draw_string(const Pos &pos,char *msg) { ++void Viewport::draw_string(const Pos &pos,const char *msg) { + XDrawString(xvars.dpy[dpyNum],arena, + xvars.gc[dpyNum], + pos.x,pos.y + xvars.font[dpyNum]->max_bounds.ascent, +@@ -1930,7 +1921,7 @@ void Viewport::create_menus() { + new ButtonPanel(dpyNum,xvars,toplevel, + pos,newGameUnit, + Viewport::panel_callback,panelClosures.get(menuNewGame), +- "New Game"); ++ "New Game (F2)"); + assert(p); + p->set_background(menuBg,False); + pos.x += newGameUnit.width; +@@ -2016,7 +2007,7 @@ void Viewport::create_menus() { + new TextPanel(dpyNum,xvars,toplevel, + pos,styleUnit, + NULL,NULL, +- "Game style:"); ++ "Game style: (F3)"); + assert(p); + // p->set_background(menuBg,False); + pos.x += styleUnit.width; +@@ -2194,33 +2185,24 @@ void Viewport::update_statuses() { + } + + const IntelStatus *status = intel->get_intel_status(); ++ statuses[statusName]->set_message(status->name); ++ ++ statuses[statusClassName]->set_message(status->className); + +- ostrstream name; +- name << status->name << ends; +- statuses[statusName]->set_message(name.str()); +- delete name.str(); +- +- ostrstream className; +- className << status->className << ends; +- statuses[statusClassName]->set_message(className.str()); +- delete className.str(); +- +- ostrstream health; ++ stringstream health; + if (status->health == -1) { +- health << "Dead" << ends; ++ health << "Dead"; + } + else { +- health << status->health << " Health" << ends; ++ health << status->health << " Health"; + } +- statuses[statusHealth]->set_message(health.str()); +- delete health.str(); ++ statuses[statusHealth]->set_message(health.str().c_str()); + +- ostrstream mass; +- mass << status->mass << " Mass" << ends; +- statuses[statusMass]->set_message(mass.str()); +- delete mass.str(); ++ stringstream mass; ++ mass << status->mass << " Mass"; ++ statuses[statusMass]->set_message(mass.str().c_str()); + +- ostrstream weapon; ++ stringstream weapon; + if (status->weaponClassId == A_None) { + weapon << "No Weapon"; + } +@@ -2230,62 +2212,56 @@ void Viewport::update_statuses() { + if (status->ammo != PH_AMMO_UNLIMITED) { + weapon << " (" << status->ammo << ")"; + } +- weapon << ends; + statuses[statusWeapon]-> + set_foreground(status->weaponReady ? + xvars.green[dpyNum] : xvars.red[dpyNum],False); +- statuses[statusWeapon]->set_message(weapon.str()); +- delete weapon.str(); ++ statuses[statusWeapon]->set_message(weapon.str().c_str()); + +- ostrstream item; ++ stringstream item; + if (status->itemClassId == A_None) { + item << "No Item"; + } + else { + item << status->item << " (" << status->itemCount << ")"; + } +- item << ends; +- statuses[statusItem]->set_message(item.str()); +- delete item.str(); ++ statuses[statusItem]->set_message(item.str().c_str()); + +- ostrstream livesHKills; ++ stringstream livesHKills; + if (styleInfo->get_game_style_type() == EXTENDED) { + // Takes soups into account. + livesHKills << (status->humanKills - status->soups) +- << " Human Kills" << ends; ++ << " Human Kills"; + } + else { + if (status->lives == IT_INFINITE_LIVES) { + // Does this case ever happen? I don't think so. +- livesHKills << "Unlimited Lives" << ends; ++ livesHKills << "Unlimited Lives"; + } + else { + if (status->lives == 1) { +- livesHKills << "1 Life" << ends; ++ livesHKills << "1 Life"; + } + else { +- livesHKills << status->lives << " Lives" << ends; ++ livesHKills << status->lives << " Lives"; + } + } + } +- statuses[statusLivesHKills]->set_message(livesHKills.str()); +- delete livesHKills.str(); ++ statuses[statusLivesHKills]->set_message(livesHKills.str().c_str()); + +- ostrstream killsMKills; ++ stringstream killsMKills; + if (styleInfo->get_game_style_type() == EXTENDED) { +- killsMKills << status->enemyKills << " Machine Kills" << ends; ++ killsMKills << status->enemyKills << " Machine Kills"; + } + else { + int kills = status->humanKills + status->enemyKills; + if (kills == 1) { +- killsMKills << "1 Kill" << ends; ++ killsMKills << "1 Kill"; + } + else { +- killsMKills << kills << " Kills" << ends; ++ killsMKills << kills << " Kills"; + } + } +- statuses[statusKillsMKills]->set_message(killsMKills.str()); +- delete killsMKills.str(); ++ statuses[statusKillsMKills]->set_message(killsMKills.str().c_str()); + } + + +Index: xevil-2.02r2/x11/viewport.h +=================================================================== +--- xevil-2.02r2.orig/x11/viewport.h ++++ xevil-2.02r2/x11/viewport.h +@@ -348,7 +348,7 @@ protected: + /* NOTE: Will draw everything if redrawArena is true, else just what has + changed. */ + +- void draw_string(const Pos &pos,char *msg); ++ void draw_string(const Pos &pos,const char *msg); + /* EFFECTS: Draw string msg using current GC on arena with upper left of + character at position pos. */ + +Index: xevil-2.02r2/x11/xdata.cpp +=================================================================== +--- xevil-2.02r2.orig/x11/xdata.cpp ++++ xevil-2.02r2/x11/xdata.cpp +@@ -1,4 +1,5 @@ + /* ++ * WK - note to self - search for xpmcreate + * XEvil(TM) Copyright (C) 1994,2000 Steve Hardt and Michael Judge + * http://www.xevil.com + * satan@xevil.com +@@ -30,11 +31,12 @@ + #include "xdata.h" + #include "area.h" + +-#include ++#include + #include + #include + #include + ++using namespace std; + + + // Means always allocate some color, even if it's really, really bad. +@@ -47,9 +49,16 @@ Window Xvars::create_toplevel_window(int + int dpyNum,const Size& size, + const char* title, + long eventMask) { ++ ++ // Get Size of screen, so we can center Window ++ XWindowAttributes root_window_attributes; ++ XGetWindowAttributes(dpy[dpyNum],root[dpyNum], &root_window_attributes); ++ int left = (root_window_attributes.width - size.width) / 2; ++ int top = (root_window_attributes.height - size.height) / 3; ++ + // Creates with 0 border width. + Window toplevel = +- XCreateSimpleWindow(dpy[dpyNum],root[dpyNum],0,0, ++ XCreateSimpleWindow(dpy[dpyNum],root[dpyNum],left,top, + size.width,size.height, + 0,windowBorder[dpyNum], + windowBg[dpyNum]); +@@ -90,7 +99,9 @@ Window Xvars::create_toplevel_window(int + + XClassHint class_hints; + class_hints.res_name = argv[0]; +- class_hints.res_class = "XEvil"; ++ ++ static char res_class[] = "XEvil"; ++ class_hints.res_class = res_class; + + XSetWMProperties(dpy[dpyNum],toplevel, + &windowName,&iconName,argv,argc, +@@ -185,14 +196,14 @@ void Xvars::generate_pixmap_from_transfo + + + Boolean Xvars::load_pixmap(Drawable* pixmap,Drawable* mask, +- int dpyNum,char** xpmBits) { ++ int dpyNum, const char** xpmBits) { + return load_pixmap(pixmap,mask,dpyNum,xpmBits,is_stretched()); + } + + + + Boolean Xvars::load_pixmap(Drawable* pixmap,Drawable* mask, +- int dpyNum,char** xpmBits,Boolean fullSize) { ++ int dpyNum, const char** xpmBits,Boolean fullSize) { + // Just load XPM as is. + if (fullSize) { + XpmAttributes attr; +@@ -200,9 +211,9 @@ Boolean Xvars::load_pixmap(Drawable* pix + attr.closeness = XPM_CLOSENESS; + attr.alloc_close_colors = True; + +- int val = ++ int val = + XpmCreatePixmapFromData(dpy[dpyNum],root[dpyNum], +- xpmBits, ++ const_cast (xpmBits), + pixmap,mask, + &attr); + XpmFreeAttributes(&attr); +@@ -212,7 +223,7 @@ Boolean Xvars::load_pixmap(Drawable* pix + ret = False; + } + +- return ret; ++ return ret; + } + + +@@ -231,9 +242,8 @@ Boolean Xvars::load_pixmap(Drawable* pix + + // Perhaps should use XpmReturnAllocPixels, neither gives the transparent + // value. +- int val = +- XpmCreateImageFromData(dpy[dpyNum], +- xpmBits, ++ int val = XpmCreateImageFromData(dpy[dpyNum], ++ const_cast (xpmBits), + &srcImage,(mask ? &srcMask : (XImage**)NULL), + &attr); + srcSize.width = attr.width; +Index: xevil-2.02r2/x11/xdata.h +=================================================================== +--- xevil-2.02r2.orig/x11/xdata.h ++++ xevil-2.02r2/x11/xdata.h +@@ -74,7 +74,7 @@ typedef char *CMN_BITS_ID; + + typedef XEvent *CMN_EVENTDATA; + +-typedef char *CMN_COLOR; ++typedef const char *CMN_COLOR; + + + +@@ -132,14 +132,14 @@ public: + transformations. Use scratch for all scratch calculations. */ + + Boolean load_pixmap(Drawable* pixmap,Drawable* mask, +- int dpyNum,char** xpmBits); ++ int dpyNum, const char** xpmBits); + /* MODIFIES: pixmap, mask */ + /* EFFECTS: Load an XPM pixmap and mask from xpmBits. Only load mask if + non-NULL. Reduce pixmap size by a factor of 2 if + !xvars.is_stretched(). */ + + Boolean load_pixmap(Drawable* pixmap,Drawable* mask, +- int dpyNum,char** xpmBits,Boolean fullSize); ++ int dpyNum, const char** xpmBits,Boolean fullSize); + /* EFFECTS: Same as above load_pixmap() except caller explicitly + specifies whether pixmap is fullSize or reduced by a factor of 2. */ + /* NOTE: This method can be called before Xvars::stretch is set. */ diff -Nru xevil-2.02r2/debian/patches/0002_xpm_const.patch xevil-2.02r2/debian/patches/0002_xpm_const.patch --- xevil-2.02r2/debian/patches/0002_xpm_const.patch 1970-01-01 00:00:00.000000000 +0000 +++ xevil-2.02r2/debian/patches/0002_xpm_const.patch 2022-01-12 13:15:35.000000000 +0000 @@ -0,0 +1,4301 @@ +Index: xevil-2.02r2/x11/bitmaps/ui/xevil_icon.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/bitmaps/ui/xevil_icon.xpm ++++ xevil-2.02r2/x11/bitmaps/ui/xevil_icon.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *xevil_icon[] = { ++static const char *xevil_icon[] = { + /* width height num_colors chars_per_pixel */ + " 32 32 9 1", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/PCP/PCP_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/PCP/PCP_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/PCP/PCP_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *PCP_4[] = { ++static const char *PCP_4[] = { + /* width height ncolors chars_per_pixel */ + "24 12 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_0[] = { ++static const char *alien_0[] = { + /* width height ncolors chars_per_pixel */ + "48 58 15 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_0b[] = { ++static const char *alien_0b[] = { + /* width height ncolors chars_per_pixel */ + "48 58 16 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_0c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_0c.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_0c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_0c[] = { ++static const char *alien_0c[] = { + /* width height ncolors chars_per_pixel */ + "48 58 16 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_0d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_0d.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_0d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_0d[] = { ++static const char *alien_0d[] = { + /* width height ncolors chars_per_pixel */ + "48 58 15 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_0e.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_0e.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_0e.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_0e[] = { ++static const char *alien_0e[] = { + /* width height ncolors chars_per_pixel */ + "48 58 15 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_0f.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_0f.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_0f.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_0f[] = { ++static const char *alien_0f[] = { + /* width height ncolors chars_per_pixel */ + "48 58 15 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_10b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_10b.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_10b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_10b[] = { ++static const char *alien_10b[] = { + /* width height ncolors chars_per_pixel */ + "62 32 15 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_10c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_10c.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_10c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_10c[] = { ++static const char *alien_10c[] = { + /* width height ncolors chars_per_pixel */ + "62 32 15 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_10d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_10d.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_10d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_10d[] = { ++static const char *alien_10d[] = { + /* width height ncolors chars_per_pixel */ + "62 32 15 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_18.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_18.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_18.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_18[] = { ++static const char *alien_18[] = { + /* width height ncolors chars_per_pixel */ + "18 58 16 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_2[] = { ++static const char *alien_2[] = { + /* width height ncolors chars_per_pixel */ + "52 56 16 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_20b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_20b.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_20b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_20b[] = { ++static const char *alien_20b[] = { + /* width height ncolors chars_per_pixel */ + "18 58 16 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_20c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_20c.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_20c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_20c[] = { ++static const char *alien_20c[] = { + /* width height ncolors chars_per_pixel */ + "18 58 17 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_25[] = { ++static const char *alien_25[] = { + /* width height ncolors chars_per_pixel */ + "60 22 17 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_4[] = { ++static const char *alien_4[] = { + /* width height ncolors chars_per_pixel */ + "26 58 16 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_5[] = { ++static const char *alien_5[] = { + /* width height ncolors chars_per_pixel */ + "20 54 15 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/alien/alien_9.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/alien/alien_9.xpm ++++ xevil-2.02r2/x11/gen_xpm/alien/alien_9.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *alien_9[] = { ++static const char *alien_9[] = { + /* width height ncolors chars_per_pixel */ + "62 32 15 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/altar_of_sin/altar_of_sin_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *altar_of_sin_4[] = { ++static const char *altar_of_sin_4[] = { + /* width height ncolors chars_per_pixel */ + "48 64 69 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/altar_of_sin/altar_of_sin_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *altar_of_sin_4b[] = { ++static const char *altar_of_sin_4b[] = { + /* width height ncolors chars_per_pixel */ + "48 64 68 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/altar_of_sin/altar_of_sin_4c.xpm ++++ xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *altar_of_sin_4c[] = { ++static const char *altar_of_sin_4c[] = { + /* width height ncolors chars_per_pixel */ + "48 64 67 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/auto_lancer/auto_lancer_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/auto_lancer/auto_lancer_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/auto_lancer/auto_lancer_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *auto_lancer_4[] = { ++static const char *auto_lancer_4[] = { + /* width height ncolors chars_per_pixel */ + "40 12 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/baby_seal/baby_seal_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *baby_seal_0[] = { ++static const char *baby_seal_0[] = { + /* width height ncolors chars_per_pixel */ + "28 22 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/baby_seal/baby_seal_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *baby_seal_0b[] = { ++static const char *baby_seal_0b[] = { + /* width height ncolors chars_per_pixel */ + "28 22 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/baby_seal/baby_seal_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *baby_seal_25[] = { ++static const char *baby_seal_25[] = { + /* width height ncolors chars_per_pixel */ + "38 8 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/baby_seal/baby_seal_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *baby_seal_4[] = { ++static const char *baby_seal_4[] = { + /* width height ncolors chars_per_pixel */ + "22 22 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/blood/blood_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/blood/blood_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/blood/blood_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *blood_25[] = { ++static const char *blood_25[] = { + /* width height ncolors chars_per_pixel */ + "14 4 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/blood/blood_39.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/blood/blood_39.xpm ++++ xevil-2.02r2/x11/gen_xpm/blood/blood_39.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *blood_39[] = { ++static const char *blood_39[] = { + /* width height ncolors chars_per_pixel */ + "10 10 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/blood/blood_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/blood/blood_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/blood/blood_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *blood_4[] = { ++static const char *blood_4[] = { + /* width height ncolors chars_per_pixel */ + "4 8 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/blood/blood_40.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/blood/blood_40.xpm ++++ xevil-2.02r2/x11/gen_xpm/blood/blood_40.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *blood_40[] = { ++static const char *blood_40[] = { + /* width height ncolors chars_per_pixel */ + "12 8 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/blood/blood_9.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/blood/blood_9.xpm ++++ xevil-2.02r2/x11/gen_xpm/blood/blood_9.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *blood_9[] = { ++static const char *blood_9[] = { + /* width height ncolors chars_per_pixel */ + "14 2 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/bomb/bomb_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/bomb/bomb_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *bomb_25[] = { ++static const char *bomb_25[] = { + /* width height ncolors chars_per_pixel */ + "28 26 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/bomb/bomb_25b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/bomb/bomb_25b.xpm ++++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_25b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *bomb_25b[] = { ++static const char *bomb_25b[] = { + /* width height ncolors chars_per_pixel */ + "28 26 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/bomb/bomb_26.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/bomb/bomb_26.xpm ++++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_26.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *bomb_26[] = { ++static const char *bomb_26[] = { + /* width height ncolors chars_per_pixel */ + "28 26 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/bomb/bomb_27.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/bomb/bomb_27.xpm ++++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_27.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *bomb_27[] = { ++static const char *bomb_27[] = { + /* width height ncolors chars_per_pixel */ + "28 26 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/bomb/bomb_28.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/bomb/bomb_28.xpm ++++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_28.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *bomb_28[] = { ++static const char *bomb_28[] = { + /* width height ncolors chars_per_pixel */ + "28 26 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/bomb/bomb_29.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/bomb/bomb_29.xpm ++++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_29.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *bomb_29[] = { ++static const char *bomb_29[] = { + /* width height ncolors chars_per_pixel */ + "28 26 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/bomb/bomb_30.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/bomb/bomb_30.xpm ++++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_30.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *bomb_30[] = { ++static const char *bomb_30[] = { + /* width height ncolors chars_per_pixel */ + "28 26 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/bomb/bomb_31.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/bomb/bomb_31.xpm ++++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_31.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *bomb_31[] = { ++static const char *bomb_31[] = { + /* width height ncolors chars_per_pixel */ + "28 26 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/caffine/caffine_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/caffine/caffine_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/caffine/caffine_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *caffine_4[] = { ++static const char *caffine_4[] = { + /* width height ncolors chars_per_pixel */ + "12 22 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chainsaw/chainsaw_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chainsaw_0[] = { ++static const char *chainsaw_0[] = { + /* width height ncolors chars_per_pixel */ + "38 18 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chainsaw/chainsaw_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chainsaw_0b[] = { ++static const char *chainsaw_0b[] = { + /* width height ncolors chars_per_pixel */ + "38 18 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chainsaw/chainsaw_0c.xpm ++++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chainsaw_0c[] = { ++static const char *chainsaw_0c[] = { + /* width height ncolors chars_per_pixel */ + "38 18 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chainsaw/chainsaw_1.xpm ++++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chainsaw_1[] = { ++static const char *chainsaw_1[] = { + /* width height ncolors chars_per_pixel */ + "38 18 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chainsaw/chainsaw_1b.xpm ++++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chainsaw_1b[] = { ++static const char *chainsaw_1b[] = { + /* width height ncolors chars_per_pixel */ + "38 18 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chainsaw/chainsaw_1c.xpm ++++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chainsaw_1c[] = { ++static const char *chainsaw_1c[] = { + /* width height ncolors chars_per_pixel */ + "38 18 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chainsaw/chainsaw_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chainsaw_4[] = { ++static const char *chainsaw_4[] = { + /* width height ncolors chars_per_pixel */ + "18 38 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chainsaw/chainsaw_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chainsaw_4b[] = { ++static const char *chainsaw_4b[] = { + /* width height ncolors chars_per_pixel */ + "18 38 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chainsaw/chainsaw_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chainsaw_5[] = { ++static const char *chainsaw_5[] = { + /* width height ncolors chars_per_pixel */ + "12 18 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_5b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chainsaw/chainsaw_5b.xpm ++++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_5b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chainsaw_5b[] = { ++static const char *chainsaw_5b[] = { + /* width height ncolors chars_per_pixel */ + "12 18 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_7.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chainsaw/chainsaw_7.xpm ++++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_7.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chainsaw_7[] = { ++static const char *chainsaw_7[] = { + /* width height ncolors chars_per_pixel */ + "18 38 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_7b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chainsaw/chainsaw_7b.xpm ++++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_7b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chainsaw_7b[] = { ++static const char *chainsaw_7b[] = { + /* width height ncolors chars_per_pixel */ + "18 38 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_0[] = { ++static const char *chopper_boy_0[] = { + /* width height ncolors chars_per_pixel */ + "28 40 42 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_0b[] = { ++static const char *chopper_boy_0b[] = { + /* width height ncolors chars_per_pixel */ + "28 40 45 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_0c.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_0c[] = { ++static const char *chopper_boy_0c[] = { + /* width height ncolors chars_per_pixel */ + "28 40 47 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_0d.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_0d[] = { ++static const char *chopper_boy_0d[] = { + /* width height ncolors chars_per_pixel */ + "28 40 42 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0e.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_0e.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0e.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_0e[] = { ++static const char *chopper_boy_0e[] = { + /* width height ncolors chars_per_pixel */ + "28 40 47 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0f.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_0f.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0f.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_0f[] = { ++static const char *chopper_boy_0f[] = { + /* width height ncolors chars_per_pixel */ + "28 40 49 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_2[] = { ++static const char *chopper_boy_2[] = { + /* width height ncolors chars_per_pixel */ + "24 40 41 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_21.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_21[] = { ++static const char *chopper_boy_21[] = { + /* width height ncolors chars_per_pixel */ + "26 40 57 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_21b.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_21b[] = { ++static const char *chopper_boy_21b[] = { + /* width height ncolors chars_per_pixel */ + "26 40 58 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_21c.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_21c[] = { ++static const char *chopper_boy_21c[] = { + /* width height ncolors chars_per_pixel */ + "26 40 58 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_21d.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_21d[] = { ++static const char *chopper_boy_21d[] = { + /* width height ncolors chars_per_pixel */ + "26 40 59 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_22.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_22[] = { ++static const char *chopper_boy_22[] = { + /* width height ncolors chars_per_pixel */ + "26 40 58 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_22b.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_22b[] = { ++static const char *chopper_boy_22b[] = { + /* width height ncolors chars_per_pixel */ + "26 40 59 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_22c.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_22c[] = { ++static const char *chopper_boy_22c[] = { + /* width height ncolors chars_per_pixel */ + "26 40 59 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_22d.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_22d[] = { ++static const char *chopper_boy_22d[] = { + /* width height ncolors chars_per_pixel */ + "26 40 60 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_25[] = { ++static const char *chopper_boy_25[] = { + /* width height ncolors chars_per_pixel */ + "38 18 43 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_2b.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_2b[] = { ++static const char *chopper_boy_2b[] = { + /* width height ncolors chars_per_pixel */ + "24 40 42 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_2c.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_2c[] = { ++static const char *chopper_boy_2c[] = { + /* width height ncolors chars_per_pixel */ + "24 40 41 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_2d.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_2d[] = { ++static const char *chopper_boy_2d[] = { + /* width height ncolors chars_per_pixel */ + "24 40 42 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_4[] = { ++static const char *chopper_boy_4[] = { + /* width height ncolors chars_per_pixel */ + "26 40 58 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_4b[] = { ++static const char *chopper_boy_4b[] = { + /* width height ncolors chars_per_pixel */ + "26 40 59 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_4c.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_4c[] = { ++static const char *chopper_boy_4c[] = { + /* width height ncolors chars_per_pixel */ + "26 40 59 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_4d.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_4d[] = { ++static const char *chopper_boy_4d[] = { + /* width height ncolors chars_per_pixel */ + "26 40 60 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/chopper_boy/chopper_boy_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *chopper_boy_5[] = { ++static const char *chopper_boy_5[] = { + /* width height ncolors chars_per_pixel */ + "26 40 55 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/cloak/cloak_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/cloak/cloak_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/cloak/cloak_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *cloak_4[] = { ++static const char *cloak_4[] = { + /* width height ncolors chars_per_pixel */ + "30 30 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/cloak/cloak_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/cloak/cloak_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/cloak/cloak_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *cloak_4b[] = { ++static const char *cloak_4b[] = { + /* width height ncolors chars_per_pixel */ + "30 30 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/cloak/cloak_4c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/cloak/cloak_4c.xpm ++++ xevil-2.02r2/x11/gen_xpm/cloak/cloak_4c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *cloak_4c[] = { ++static const char *cloak_4c[] = { + /* width height ncolors chars_per_pixel */ + "30 30 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/cloak/cloak_4d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/cloak/cloak_4d.xpm ++++ xevil-2.02r2/x11/gen_xpm/cloak/cloak_4d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *cloak_4d[] = { ++static const char *cloak_4d[] = { + /* width height ncolors chars_per_pixel */ + "30 30 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/cloak/cloak_4e.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/cloak/cloak_4e.xpm ++++ xevil-2.02r2/x11/gen_xpm/cloak/cloak_4e.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *cloak_4e[] = { ++static const char *cloak_4e[] = { + /* width height ncolors chars_per_pixel */ + "30 30 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/cloak/cloak_4f.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/cloak/cloak_4f.xpm ++++ xevil-2.02r2/x11/gen_xpm/cloak/cloak_4f.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *cloak_4f[] = { ++static const char *cloak_4f[] = { + /* width height ncolors chars_per_pixel */ + "30 30 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/crack_pipe/crack_pipe_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/crack_pipe/crack_pipe_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/crack_pipe/crack_pipe_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *crack_pipe_4[] = { ++static const char *crack_pipe_4[] = { + /* width height ncolors chars_per_pixel */ + "20 10 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/demon_summoner/demon_summoner_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/demon_summoner/demon_summoner_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/demon_summoner/demon_summoner_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *demon_summoner_4[] = { ++static const char *demon_summoner_4[] = { + /* width height ncolors chars_per_pixel */ + "10 26 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_0[] = { ++static const char *dog_0[] = { + /* width height ncolors chars_per_pixel */ + "24 20 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_0b[] = { ++static const char *dog_0b[] = { + /* width height ncolors chars_per_pixel */ + "24 20 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_19.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_19.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_19.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_19[] = { ++static const char *dog_19[] = { + /* width height ncolors chars_per_pixel */ + "20 24 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_19b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_19b.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_19b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_19b[] = { ++static const char *dog_19b[] = { + /* width height ncolors chars_per_pixel */ + "20 24 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_2[] = { ++static const char *dog_2[] = { + /* width height ncolors chars_per_pixel */ + "24 18 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_20b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_20b.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_20b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_20b[] = { ++static const char *dog_20b[] = { + /* width height ncolors chars_per_pixel */ + "20 24 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_25[] = { ++static const char *dog_25[] = { + /* width height ncolors chars_per_pixel */ + "24 14 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_26.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_26.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_26.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_26[] = { ++static const char *dog_26[] = { + /* width height ncolors chars_per_pixel */ + "24 20 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_28.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_28.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_28.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_28[] = { ++static const char *dog_28[] = { + /* width height ncolors chars_per_pixel */ + "24 18 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_38.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_38.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_38.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_38[] = { ++static const char *dog_38[] = { + /* width height ncolors chars_per_pixel */ + "18 24 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_39.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_39.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_39.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_39[] = { ++static const char *dog_39[] = { + /* width height ncolors chars_per_pixel */ + "18 24 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_4[] = { ++static const char *dog_4[] = { + /* width height ncolors chars_per_pixel */ + "20 24 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_5[] = { ++static const char *dog_5[] = { + /* width height ncolors chars_per_pixel */ + "10 20 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog/dog_5b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog/dog_5b.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog/dog_5b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_5b[] = { ++static const char *dog_5b[] = { + /* width height ncolors chars_per_pixel */ + "10 20 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dog_whistle/dog_whistle_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dog_whistle/dog_whistle_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/dog_whistle/dog_whistle_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dog_whistle_4[] = { ++static const char *dog_whistle_4[] = { + /* width height ncolors chars_per_pixel */ + "8 26 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/doppelganger/doppelganger_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/doppelganger/doppelganger_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/doppelganger/doppelganger_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *doppelganger_4[] = { ++static const char *doppelganger_4[] = { + /* width height ncolors chars_per_pixel */ + "22 24 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/doppelganger/doppelganger_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/doppelganger/doppelganger_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/doppelganger/doppelganger_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *doppelganger_4b[] = { ++static const char *doppelganger_4b[] = { + /* width height ncolors chars_per_pixel */ + "22 24 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dragon/dragon_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dragon/dragon_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/dragon/dragon_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dragon_0[] = { ++static const char *dragon_0[] = { + /* width height ncolors chars_per_pixel */ + "56 58 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dragon/dragon_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dragon/dragon_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/dragon/dragon_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dragon_25[] = { ++static const char *dragon_25[] = { + /* width height ncolors chars_per_pixel */ + "56 28 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dragon/dragon_26.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dragon/dragon_26.xpm ++++ xevil-2.02r2/x11/gen_xpm/dragon/dragon_26.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dragon_26[] = { ++static const char *dragon_26[] = { + /* width height ncolors chars_per_pixel */ + "56 58 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dragon/dragon_26b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dragon/dragon_26b.xpm ++++ xevil-2.02r2/x11/gen_xpm/dragon/dragon_26b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dragon_26b[] = { ++static const char *dragon_26b[] = { + /* width height ncolors chars_per_pixel */ + "56 58 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dragon/dragon_26c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dragon/dragon_26c.xpm ++++ xevil-2.02r2/x11/gen_xpm/dragon/dragon_26c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dragon_26c[] = { ++static const char *dragon_26c[] = { + /* width height ncolors chars_per_pixel */ + "56 58 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/dragon/dragon_26d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/dragon/dragon_26d.xpm ++++ xevil-2.02r2/x11/gen_xpm/dragon/dragon_26d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *dragon_26d[] = { ++static const char *dragon_26d[] = { + /* width height ncolors chars_per_pixel */ + "56 58 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/egg/egg_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/egg/egg_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/egg/egg_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *egg_4[] = { ++static const char *egg_4[] = { + /* width height ncolors chars_per_pixel */ + "20 30 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/egg/egg_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/egg/egg_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/egg/egg_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *egg_5[] = { ++static const char *egg_5[] = { + /* width height ncolors chars_per_pixel */ + "20 30 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/enforcer/enforcer_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *enforcer_0[] = { ++static const char *enforcer_0[] = { + /* width height ncolors chars_per_pixel */ + "32 60 41 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/enforcer/enforcer_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *enforcer_0b[] = { ++static const char *enforcer_0b[] = { + /* width height ncolors chars_per_pixel */ + "32 60 41 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/enforcer/enforcer_0c.xpm ++++ xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *enforcer_0c[] = { ++static const char *enforcer_0c[] = { + /* width height ncolors chars_per_pixel */ + "32 60 43 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/enforcer/enforcer_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *enforcer_25[] = { ++static const char *enforcer_25[] = { + /* width height ncolors chars_per_pixel */ + "60 32 41 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/enforcer/enforcer_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *enforcer_4[] = { ++static const char *enforcer_4[] = { + /* width height ncolors chars_per_pixel */ + "32 60 34 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/exit/exit_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/exit/exit_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/exit/exit_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *exit_4[] = { ++static const char *exit_4[] = { + /* width height ncolors chars_per_pixel */ + "60 60 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/fire/fire_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/fire/fire_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/fire/fire_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *fire_4[] = { ++static const char *fire_4[] = { + /* width height ncolors chars_per_pixel */ + "42 42 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/fire_demon/fire_demon_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *fire_demon_0[] = { ++static const char *fire_demon_0[] = { + /* width height ncolors chars_per_pixel */ + "104 88 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/fire_demon/fire_demon_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *fire_demon_0b[] = { ++static const char *fire_demon_0b[] = { + /* width height ncolors chars_per_pixel */ + "104 88 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/fire_demon/fire_demon_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *fire_demon_2[] = { ++static const char *fire_demon_2[] = { + /* width height ncolors chars_per_pixel */ + "92 88 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_22.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/fire_demon/fire_demon_22.xpm ++++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_22.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *fire_demon_22[] = { ++static const char *fire_demon_22[] = { + /* width height ncolors chars_per_pixel */ + "120 96 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/fire_demon/fire_demon_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *fire_demon_25[] = { ++static const char *fire_demon_25[] = { + /* width height ncolors chars_per_pixel */ + "98 44 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/fire_demon/fire_demon_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *fire_demon_4[] = { ++static const char *fire_demon_4[] = { + /* width height ncolors chars_per_pixel */ + "96 96 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/fire_demon/fire_demon_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *fire_demon_5[] = { ++static const char *fire_demon_5[] = { + /* width height ncolors chars_per_pixel */ + "94 96 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_5b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/fire_demon/fire_demon_5b.xpm ++++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_5b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *fire_demon_5b[] = { ++static const char *fire_demon_5b[] = { + /* width height ncolors chars_per_pixel */ + "94 96 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/fireball/fireball_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/fireball/fireball_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/fireball/fireball_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *fireball_4[] = { ++static const char *fireball_4[] = { + /* width height ncolors chars_per_pixel */ + "48 48 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/fireball/fireball_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/fireball/fireball_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/fireball/fireball_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *fireball_4b[] = { ++static const char *fireball_4b[] = { + /* width height ncolors chars_per_pixel */ + "48 48 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/fireball/fireball_4c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/fireball/fireball_4c.xpm ++++ xevil-2.02r2/x11/gen_xpm/fireball/fireball_4c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *fireball_4c[] = { ++static const char *fireball_4c[] = { + /* width height ncolors chars_per_pixel */ + "48 48 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/flag/flag_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/flag/flag_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/flag/flag_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *flag_4[] = { ++static const char *flag_4[] = { + /* width height ncolors chars_per_pixel */ + "22 26 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/flame_thrower/flame_thrower_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/flame_thrower/flame_thrower_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/flame_thrower/flame_thrower_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *flame_thrower_4[] = { ++static const char *flame_thrower_4[] = { + /* width height ncolors chars_per_pixel */ + "32 18 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/frog/frog_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/frog/frog_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/frog/frog_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *frog_0[] = { ++static const char *frog_0[] = { + /* width height ncolors chars_per_pixel */ + "14 10 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/frog/frog_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/frog/frog_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/frog/frog_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *frog_2[] = { ++static const char *frog_2[] = { + /* width height ncolors chars_per_pixel */ + "26 16 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/frog/frog_24.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/frog/frog_24.xpm ++++ xevil-2.02r2/x11/gen_xpm/frog/frog_24.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *frog_24[] = { ++static const char *frog_24[] = { + /* width height ncolors chars_per_pixel */ + "26 16 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/frog/frog_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/frog/frog_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/frog/frog_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *frog_25[] = { ++static const char *frog_25[] = { + /* width height ncolors chars_per_pixel */ + "14 14 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/frog/frog_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/frog/frog_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/frog/frog_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *frog_4[] = { ++static const char *frog_4[] = { + /* width height ncolors chars_per_pixel */ + "18 22 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/frog/frog_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/frog/frog_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/frog/frog_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *frog_5[] = { ++static const char *frog_5[] = { + /* width height ncolors chars_per_pixel */ + "18 10 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/frog_gun/frog_gun_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/frog_gun/frog_gun_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/frog_gun/frog_gun_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *frog_gun_4[] = { ++static const char *frog_gun_4[] = { + /* width height ncolors chars_per_pixel */ + "28 16 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/frog_shell/frog_shell_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/frog_shell/frog_shell_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/frog_shell/frog_shell_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *frog_shell_4[] = { ++static const char *frog_shell_4[] = { + /* width height ncolors chars_per_pixel */ + "10 10 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/frog_shell/frog_shell_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/frog_shell/frog_shell_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/frog_shell/frog_shell_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *frog_shell_4b[] = { ++static const char *frog_shell_4b[] = { + /* width height ncolors chars_per_pixel */ + "10 10 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/green_blood/green_blood_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *green_blood_25[] = { ++static const char *green_blood_25[] = { + /* width height ncolors chars_per_pixel */ + "14 4 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_39.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/green_blood/green_blood_39.xpm ++++ xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_39.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *green_blood_39[] = { ++static const char *green_blood_39[] = { + /* width height ncolors chars_per_pixel */ + "10 10 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/green_blood/green_blood_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *green_blood_4[] = { ++static const char *green_blood_4[] = { + /* width height ncolors chars_per_pixel */ + "4 8 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_40.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/green_blood/green_blood_40.xpm ++++ xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_40.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *green_blood_40[] = { ++static const char *green_blood_40[] = { + /* width height ncolors chars_per_pixel */ + "12 8 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_9.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/green_blood/green_blood_9.xpm ++++ xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_9.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *green_blood_9[] = { ++static const char *green_blood_9[] = { + /* width height ncolors chars_per_pixel */ + "14 2 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/green_hugger/green_hugger_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *green_hugger_0[] = { ++static const char *green_hugger_0[] = { + /* width height ncolors chars_per_pixel */ + "32 18 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/green_hugger/green_hugger_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *green_hugger_0b[] = { ++static const char *green_hugger_0b[] = { + /* width height ncolors chars_per_pixel */ + "32 18 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/green_hugger/green_hugger_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *green_hugger_2[] = { ++static const char *green_hugger_2[] = { + /* width height ncolors chars_per_pixel */ + "18 32 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/green_hugger/green_hugger_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *green_hugger_25[] = { ++static const char *green_hugger_25[] = { + /* width height ncolors chars_per_pixel */ + "32 14 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/green_hugger/green_hugger_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *green_hugger_4[] = { ++static const char *green_hugger_4[] = { + /* width height ncolors chars_per_pixel */ + "26 32 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/green_hugger/green_hugger_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *green_hugger_4b[] = { ++static const char *green_hugger_4b[] = { + /* width height ncolors chars_per_pixel */ + "26 32 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/green_hugger/green_hugger_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *green_hugger_5[] = { ++static const char *green_hugger_5[] = { + /* width height ncolors chars_per_pixel */ + "20 18 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/grenade/grenade_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/grenade/grenade_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/grenade/grenade_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *grenade_4[] = { ++static const char *grenade_4[] = { + /* width height ncolors chars_per_pixel */ + "16 16 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/grenade/grenade_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/grenade/grenade_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/grenade/grenade_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *grenade_4b[] = { ++static const char *grenade_4b[] = { + /* width height ncolors chars_per_pixel */ + "16 16 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/grenade/grenade_4c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/grenade/grenade_4c.xpm ++++ xevil-2.02r2/x11/gen_xpm/grenade/grenade_4c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *grenade_4c[] = { ++static const char *grenade_4c[] = { + /* width height ncolors chars_per_pixel */ + "16 16 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/grenade/grenade_4d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/grenade/grenade_4d.xpm ++++ xevil-2.02r2/x11/gen_xpm/grenade/grenade_4d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *grenade_4d[] = { ++static const char *grenade_4d[] = { + /* width height ncolors chars_per_pixel */ + "16 16 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/grenades/grenades_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/grenades/grenades_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/grenades/grenades_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *grenades_4[] = { ++static const char *grenades_4[] = { + /* width height ncolors chars_per_pixel */ + "28 12 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_0[] = { ++static const char *hero_0[] = { + /* width height ncolors chars_per_pixel */ + "32 56 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_0b[] = { ++static const char *hero_0b[] = { + /* width height ncolors chars_per_pixel */ + "32 56 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_0c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_0c.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_0c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_0c[] = { ++static const char *hero_0c[] = { + /* width height ncolors chars_per_pixel */ + "32 56 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_0d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_0d.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_0d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_0d[] = { ++static const char *hero_0d[] = { + /* width height ncolors chars_per_pixel */ + "32 56 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_0e.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_0e.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_0e.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_0e[] = { ++static const char *hero_0e[] = { + /* width height ncolors chars_per_pixel */ + "32 56 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_0f.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_0f.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_0f.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_0f[] = { ++static const char *hero_0f[] = { + /* width height ncolors chars_per_pixel */ + "32 56 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_10.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_10.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_10.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_10[] = { ++static const char *hero_10[] = { + /* width height ncolors chars_per_pixel */ + "28 42 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_18.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_18.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_18.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_18[] = { ++static const char *hero_18[] = { + /* width height ncolors chars_per_pixel */ + "30 66 17 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_2[] = { ++static const char *hero_2[] = { + /* width height ncolors chars_per_pixel */ + "30 50 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_20.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_20.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_20.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_20[] = { ++static const char *hero_20[] = { + /* width height ncolors chars_per_pixel */ + "30 66 19 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_20c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_20c.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_20c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_20c[] = { ++static const char *hero_20c[] = { + /* width height ncolors chars_per_pixel */ + "30 66 16 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_20d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_20d.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_20d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_20d[] = { ++static const char *hero_20d[] = { + /* width height ncolors chars_per_pixel */ + "30 66 18 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_20e.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_20e.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_20e.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_20e[] = { ++static const char *hero_20e[] = { + /* width height ncolors chars_per_pixel */ + "30 66 16 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_20f.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_20f.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_20f.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_20f[] = { ++static const char *hero_20f[] = { + /* width height ncolors chars_per_pixel */ + "30 66 18 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_25[] = { ++static const char *hero_25[] = { + /* width height ncolors chars_per_pixel */ + "56 12 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_26.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_26.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_26.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_26[] = { ++static const char *hero_26[] = { + /* width height ncolors chars_per_pixel */ + "34 56 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_28.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_28.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_28.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_28[] = { ++static const char *hero_28[] = { + /* width height ncolors chars_per_pixel */ + "62 14 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_32.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_32.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_32.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_32[] = { ++static const char *hero_32[] = { + /* width height ncolors chars_per_pixel */ + "36 46 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_38.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_38.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_38.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_38[] = { ++static const char *hero_38[] = { + /* width height ncolors chars_per_pixel */ + "22 72 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_39.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_39.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_39.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_39[] = { ++static const char *hero_39[] = { + /* width height ncolors chars_per_pixel */ + "14 62 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_4[] = { ++static const char *hero_4[] = { + /* width height ncolors chars_per_pixel */ + "26 64 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_5[] = { ++static const char *hero_5[] = { + /* width height ncolors chars_per_pixel */ + "34 56 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/hero/hero_9.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/hero/hero_9.xpm ++++ xevil-2.02r2/x11/gen_xpm/hero/hero_9.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *hero_9[] = { ++static const char *hero_9[] = { + /* width height ncolors chars_per_pixel */ + "28 42 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/home/home_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/home/home_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/home/home_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *home_4[] = { ++static const char *home_4[] = { + /* width height ncolors chars_per_pixel */ + "48 52 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/lance/lance_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/lance/lance_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/lance/lance_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *lance_25[] = { ++static const char *lance_25[] = { + /* width height ncolors chars_per_pixel */ + "80 2 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/lance/lance_28.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/lance/lance_28.xpm ++++ xevil-2.02r2/x11/gen_xpm/lance/lance_28.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *lance_28[] = { ++static const char *lance_28[] = { + /* width height ncolors chars_per_pixel */ + "2 80 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/lancer/lancer_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/lancer/lancer_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/lancer/lancer_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *lancer_4[] = { ++static const char *lancer_4[] = { + /* width height ncolors chars_per_pixel */ + "40 12 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/laser/laser_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/laser/laser_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/laser/laser_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *laser_25[] = { ++static const char *laser_25[] = { + /* width height ncolors chars_per_pixel */ + "60 2 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/laser/laser_28.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/laser/laser_28.xpm ++++ xevil-2.02r2/x11/gen_xpm/laser/laser_28.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *laser_28[] = { ++static const char *laser_28[] = { + /* width height ncolors chars_per_pixel */ + "2 60 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/launcher/launcher_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/launcher/launcher_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/launcher/launcher_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *launcher_4[] = { ++static const char *launcher_4[] = { + /* width height ncolors chars_per_pixel */ + "42 24 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/locator/tick_0_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/locator/tick_0_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/locator/tick_0_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *tick_0_0[] = { ++static const char *tick_0_0[] = { + /* width height ncolors chars_per_pixel */ + "16 14 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/locator/tick_0_7.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/locator/tick_0_7.xpm ++++ xevil-2.02r2/x11/gen_xpm/locator/tick_0_7.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *tick_0_7[] = { ++static const char *tick_0_7[] = { + /* width height ncolors chars_per_pixel */ + "16 16 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/locator/tick_1_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/locator/tick_1_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/locator/tick_1_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *tick_1_0[] = { ++static const char *tick_1_0[] = { + /* width height ncolors chars_per_pixel */ + "16 14 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/locator/tick_1_7.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/locator/tick_1_7.xpm ++++ xevil-2.02r2/x11/gen_xpm/locator/tick_1_7.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *tick_1_7[] = { ++static const char *tick_1_7[] = { + /* width height ncolors chars_per_pixel */ + "16 16 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/locator/tick_2_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/locator/tick_2_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/locator/tick_2_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *tick_2_0[] = { ++static const char *tick_2_0[] = { + /* width height ncolors chars_per_pixel */ + "16 14 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/locator/tick_2_7.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/locator/tick_2_7.xpm ++++ xevil-2.02r2/x11/gen_xpm/locator/tick_2_7.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *tick_2_7[] = { ++static const char *tick_2_7[] = { + /* width height ncolors chars_per_pixel */ + "16 16 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/locator/tick_3_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/locator/tick_3_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/locator/tick_3_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *tick_3_0[] = { ++static const char *tick_3_0[] = { + /* width height ncolors chars_per_pixel */ + "16 14 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/locator/tick_3_7.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/locator/tick_3_7.xpm ++++ xevil-2.02r2/x11/gen_xpm/locator/tick_3_7.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *tick_3_7[] = { ++static const char *tick_3_7[] = { + /* width height ncolors chars_per_pixel */ + "16 16 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/machine_gun/machine_gun_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/machine_gun/machine_gun_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/machine_gun/machine_gun_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *machine_gun_4[] = { ++static const char *machine_gun_4[] = { + /* width height ncolors chars_per_pixel */ + "34 18 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/med_kit/med_kit_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/med_kit/med_kit_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/med_kit/med_kit_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *med_kit_4[] = { ++static const char *med_kit_4[] = { + /* width height ncolors chars_per_pixel */ + "14 14 21 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/missile/missile_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/missile/missile_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/missile/missile_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *missile_25[] = { ++static const char *missile_25[] = { + /* width height ncolors chars_per_pixel */ + "20 6 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/missile/missile_39.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/missile/missile_39.xpm ++++ xevil-2.02r2/x11/gen_xpm/missile/missile_39.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *missile_39[] = { ++static const char *missile_39[] = { + /* width height ncolors chars_per_pixel */ + "14 14 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/missile/missile_40.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/missile/missile_40.xpm ++++ xevil-2.02r2/x11/gen_xpm/missile/missile_40.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *missile_40[] = { ++static const char *missile_40[] = { + /* width height ncolors chars_per_pixel */ + "18 12 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_0[] = { ++static const char *mutt_0[] = { + /* width height ncolors chars_per_pixel */ + "24 20 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_0b[] = { ++static const char *mutt_0b[] = { + /* width height ncolors chars_per_pixel */ + "24 20 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_19.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_19.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_19.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_19[] = { ++static const char *mutt_19[] = { + /* width height ncolors chars_per_pixel */ + "20 24 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_19b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_19b.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_19b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_19b[] = { ++static const char *mutt_19b[] = { + /* width height ncolors chars_per_pixel */ + "20 24 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_2[] = { ++static const char *mutt_2[] = { + /* width height ncolors chars_per_pixel */ + "24 18 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_20b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_20b.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_20b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_20b[] = { ++static const char *mutt_20b[] = { + /* width height ncolors chars_per_pixel */ + "20 24 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_25[] = { ++static const char *mutt_25[] = { + /* width height ncolors chars_per_pixel */ + "24 14 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_26.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_26.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_26.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_26[] = { ++static const char *mutt_26[] = { + /* width height ncolors chars_per_pixel */ + "24 20 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_28.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_28.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_28.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_28[] = { ++static const char *mutt_28[] = { + /* width height ncolors chars_per_pixel */ + "24 18 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_38.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_38.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_38.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_38[] = { ++static const char *mutt_38[] = { + /* width height ncolors chars_per_pixel */ + "18 24 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_39.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_39.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_39.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_39[] = { ++static const char *mutt_39[] = { + /* width height ncolors chars_per_pixel */ + "18 24 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_4[] = { ++static const char *mutt_4[] = { + /* width height ncolors chars_per_pixel */ + "20 24 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_5[] = { ++static const char *mutt_5[] = { + /* width height ncolors chars_per_pixel */ + "10 20 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/mutt/mutt_5b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/mutt/mutt_5b.xpm ++++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_5b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mutt_5b[] = { ++static const char *mutt_5b[] = { + /* width height ncolors chars_per_pixel */ + "10 20 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/n_shield/n_shield_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/n_shield/n_shield_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/n_shield/n_shield_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *n_shield_4[] = { ++static const char *n_shield_4[] = { + /* width height ncolors chars_per_pixel */ + "14 18 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/napalm_grenade/napalm_grenade_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *napalm_grenade_4[] = { ++static const char *napalm_grenade_4[] = { + /* width height ncolors chars_per_pixel */ + "16 16 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/napalm_grenade/napalm_grenade_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *napalm_grenade_4b[] = { ++static const char *napalm_grenade_4b[] = { + /* width height ncolors chars_per_pixel */ + "16 16 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/napalm_grenade/napalm_grenade_4c.xpm ++++ xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *napalm_grenade_4c[] = { ++static const char *napalm_grenade_4c[] = { + /* width height ncolors chars_per_pixel */ + "16 16 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/napalm_grenade/napalm_grenade_4d.xpm ++++ xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *napalm_grenade_4d[] = { ++static const char *napalm_grenade_4d[] = { + /* width height ncolors chars_per_pixel */ + "16 16 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/napalm_grenades/napalm_grenades_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/napalm_grenades/napalm_grenades_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/napalm_grenades/napalm_grenades_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *napalm_grenades_4[] = { ++static const char *napalm_grenades_4[] = { + /* width height ncolors chars_per_pixel */ + "28 12 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_0[] = { ++static const char *ninja_0[] = { + /* width height ncolors chars_per_pixel */ + "32 56 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_0b[] = { ++static const char *ninja_0b[] = { + /* width height ncolors chars_per_pixel */ + "32 56 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_0c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_0c.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_0c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_0c[] = { ++static const char *ninja_0c[] = { + /* width height ncolors chars_per_pixel */ + "32 56 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_0d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_0d.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_0d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_0d[] = { ++static const char *ninja_0d[] = { + /* width height ncolors chars_per_pixel */ + "32 56 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_0e.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_0e.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_0e.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_0e[] = { ++static const char *ninja_0e[] = { + /* width height ncolors chars_per_pixel */ + "32 56 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_0f.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_0f.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_0f.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_0f[] = { ++static const char *ninja_0f[] = { + /* width height ncolors chars_per_pixel */ + "32 56 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_10b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_10b.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_10b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_10b[] = { ++static const char *ninja_10b[] = { + /* width height ncolors chars_per_pixel */ + "62 22 18 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_10c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_10c.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_10c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_10c[] = { ++static const char *ninja_10c[] = { + /* width height ncolors chars_per_pixel */ + "62 22 18 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_10d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_10d.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_10d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_10d[] = { ++static const char *ninja_10d[] = { + /* width height ncolors chars_per_pixel */ + "62 22 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_10e.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_10e.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_10e.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_10e[] = { ++static const char *ninja_10e[] = { + /* width height ncolors chars_per_pixel */ + "62 22 16 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_10f.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_10f.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_10f.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_10f[] = { ++static const char *ninja_10f[] = { + /* width height ncolors chars_per_pixel */ + "62 22 19 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_18.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_18.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_18.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_18[] = { ++static const char *ninja_18[] = { + /* width height ncolors chars_per_pixel */ + "28 64 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_2[] = { ++static const char *ninja_2[] = { + /* width height ncolors chars_per_pixel */ + "36 36 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_20.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_20.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_20.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_20[] = { ++static const char *ninja_20[] = { + /* width height ncolors chars_per_pixel */ + "28 64 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_20c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_20c.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_20c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_20c[] = { ++static const char *ninja_20c[] = { + /* width height ncolors chars_per_pixel */ + "28 64 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_20d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_20d.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_20d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_20d[] = { ++static const char *ninja_20d[] = { + /* width height ncolors chars_per_pixel */ + "28 64 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_20e.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_20e.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_20e.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_20e[] = { ++static const char *ninja_20e[] = { + /* width height ncolors chars_per_pixel */ + "28 64 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_20f.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_20f.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_20f.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_20f[] = { ++static const char *ninja_20f[] = { + /* width height ncolors chars_per_pixel */ + "28 64 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_22.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_22.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_22.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_22[] = { ++static const char *ninja_22[] = { + /* width height ncolors chars_per_pixel */ + "28 60 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_22b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_22b.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_22b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_22b[] = { ++static const char *ninja_22b[] = { + /* width height ncolors chars_per_pixel */ + "28 60 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_25[] = { ++static const char *ninja_25[] = { + /* width height ncolors chars_per_pixel */ + "44 12 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_26.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_26.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_26.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_26[] = { ++static const char *ninja_26[] = { + /* width height ncolors chars_per_pixel */ + "48 48 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_28.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_28.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_28.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_28[] = { ++static const char *ninja_28[] = { + /* width height ncolors chars_per_pixel */ + "48 38 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_2b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_2b.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_2b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_2b[] = { ++static const char *ninja_2b[] = { + /* width height ncolors chars_per_pixel */ + "36 36 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_2c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_2c.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_2c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_2c[] = { ++static const char *ninja_2c[] = { + /* width height ncolors chars_per_pixel */ + "36 36 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_2d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_2d.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_2d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_2d[] = { ++static const char *ninja_2d[] = { + /* width height ncolors chars_per_pixel */ + "36 36 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_32.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_32.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_32.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_32[] = { ++static const char *ninja_32[] = { + /* width height ncolors chars_per_pixel */ + "62 22 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_38.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_38.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_38.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_38[] = { ++static const char *ninja_38[] = { + /* width height ncolors chars_per_pixel */ + "24 72 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_39.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_39.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_39.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_39[] = { ++static const char *ninja_39[] = { + /* width height ncolors chars_per_pixel */ + "28 60 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_4[] = { ++static const char *ninja_4[] = { + /* width height ncolors chars_per_pixel */ + "28 60 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_5[] = { ++static const char *ninja_5[] = { + /* width height ncolors chars_per_pixel */ + "28 56 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/ninja/ninja_9.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/ninja/ninja_9.xpm ++++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_9.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *ninja_9[] = { ++static const char *ninja_9[] = { + /* width height ncolors chars_per_pixel */ + "62 22 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/oil_droplet/oil_droplet_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *oil_droplet_25[] = { ++static const char *oil_droplet_25[] = { + /* width height ncolors chars_per_pixel */ + "14 4 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_39.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/oil_droplet/oil_droplet_39.xpm ++++ xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_39.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *oil_droplet_39[] = { ++static const char *oil_droplet_39[] = { + /* width height ncolors chars_per_pixel */ + "10 10 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/oil_droplet/oil_droplet_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *oil_droplet_4[] = { ++static const char *oil_droplet_4[] = { + /* width height ncolors chars_per_pixel */ + "4 8 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_40.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/oil_droplet/oil_droplet_40.xpm ++++ xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_40.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *oil_droplet_40[] = { ++static const char *oil_droplet_40[] = { + /* width height ncolors chars_per_pixel */ + "12 8 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_9.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/oil_droplet/oil_droplet_9.xpm ++++ xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_9.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *oil_droplet_9[] = { ++static const char *oil_droplet_9[] = { + /* width height ncolors chars_per_pixel */ + "14 2 2 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/pistol/pistol_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/pistol/pistol_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/pistol/pistol_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *pistol_4[] = { ++static const char *pistol_4[] = { + /* width height ncolors chars_per_pixel */ + "20 18 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/red_hugger/red_hugger_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *red_hugger_0[] = { ++static const char *red_hugger_0[] = { + /* width height ncolors chars_per_pixel */ + "32 18 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/red_hugger/red_hugger_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *red_hugger_0b[] = { ++static const char *red_hugger_0b[] = { + /* width height ncolors chars_per_pixel */ + "32 18 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/red_hugger/red_hugger_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *red_hugger_2[] = { ++static const char *red_hugger_2[] = { + /* width height ncolors chars_per_pixel */ + "18 32 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/red_hugger/red_hugger_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *red_hugger_25[] = { ++static const char *red_hugger_25[] = { + /* width height ncolors chars_per_pixel */ + "32 14 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/red_hugger/red_hugger_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *red_hugger_4[] = { ++static const char *red_hugger_4[] = { + /* width height ncolors chars_per_pixel */ + "26 32 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/red_hugger/red_hugger_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *red_hugger_4b[] = { ++static const char *red_hugger_4b[] = { + /* width height ncolors chars_per_pixel */ + "26 32 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/red_hugger/red_hugger_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *red_hugger_5[] = { ++static const char *red_hugger_5[] = { + /* width height ncolors chars_per_pixel */ + "20 18 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/rock/rock_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/rock/rock_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/rock/rock_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *rock_4[] = { ++static const char *rock_4[] = { + /* width height ncolors chars_per_pixel */ + "26 26 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/shell/shell_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/shell/shell_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/shell/shell_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *shell_4[] = { ++static const char *shell_4[] = { + /* width height ncolors chars_per_pixel */ + "12 12 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/soul_swapper/soul_swapper_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/soul_swapper/soul_swapper_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/soul_swapper/soul_swapper_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *soul_swapper_4[] = { ++static const char *soul_swapper_4[] = { + /* width height ncolors chars_per_pixel */ + "30 14 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/star/star_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/star/star_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/star/star_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *star_4[] = { ++static const char *star_4[] = { + /* width height ncolors chars_per_pixel */ + "14 14 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/star/star_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/star/star_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/star/star_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *star_4b[] = { ++static const char *star_4b[] = { + /* width height ncolors chars_per_pixel */ + "14 14 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/stars/stars_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/stars/stars_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/stars/stars_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *stars_4[] = { ++static const char *stars_4[] = { + /* width height ncolors chars_per_pixel */ + "36 24 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/swap_shell/swap_shell_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/swap_shell/swap_shell_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/swap_shell/swap_shell_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *swap_shell_4[] = { ++static const char *swap_shell_4[] = { + /* width height ncolors chars_per_pixel */ + "10 10 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/swap_shell/swap_shell_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/swap_shell/swap_shell_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/swap_shell/swap_shell_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *swap_shell_4b[] = { ++static const char *swap_shell_4b[] = { + /* width height ncolors chars_per_pixel */ + "10 10 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/t_shield/t_shield_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/t_shield/t_shield_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/t_shield/t_shield_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *t_shield_4[] = { ++static const char *t_shield_4[] = { + /* width height ncolors chars_per_pixel */ + "14 18 21 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/transmogifier/transmogifier_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/transmogifier/transmogifier_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/transmogifier/transmogifier_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *transmogifier_4[] = { ++static const char *transmogifier_4[] = { + /* width height ncolors chars_per_pixel */ + "52 30 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/trapdoor/trapdoor_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/trapdoor/trapdoor_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/trapdoor/trapdoor_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *trapdoor_4[] = { ++static const char *trapdoor_4[] = { + /* width height ncolors chars_per_pixel */ + "60 30 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_0[] = { ++static const char *walker_0[] = { + /* width height ncolors chars_per_pixel */ + "56 52 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_0b[] = { ++static const char *walker_0b[] = { + /* width height ncolors chars_per_pixel */ + "56 52 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_0c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_0c.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_0c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_0c[] = { ++static const char *walker_0c[] = { + /* width height ncolors chars_per_pixel */ + "56 52 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_0d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_0d.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_0d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_0d[] = { ++static const char *walker_0d[] = { + /* width height ncolors chars_per_pixel */ + "56 52 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_18.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_18.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_18.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_18[] = { ++static const char *walker_18[] = { + /* width height ncolors chars_per_pixel */ + "32 52 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_2[] = { ++static const char *walker_2[] = { + /* width height ncolors chars_per_pixel */ + "74 30 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_20b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_20b.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_20b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_20b[] = { ++static const char *walker_20b[] = { + /* width height ncolors chars_per_pixel */ + "32 52 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_25[] = { ++static const char *walker_25[] = { + /* width height ncolors chars_per_pixel */ + "54 28 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_2b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_2b.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_2b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_2b[] = { ++static const char *walker_2b[] = { + /* width height ncolors chars_per_pixel */ + "74 30 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_4[] = { ++static const char *walker_4[] = { + /* width height ncolors chars_per_pixel */ + "40 26 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_4b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_4b.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_4b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_4b[] = { ++static const char *walker_4b[] = { + /* width height ncolors chars_per_pixel */ + "40 26 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_4c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_4c.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_4c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_4c[] = { ++static const char *walker_4c[] = { + /* width height ncolors chars_per_pixel */ + "40 26 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_4d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_4d.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_4d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_4d[] = { ++static const char *walker_4d[] = { + /* width height ncolors chars_per_pixel */ + "40 26 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_5[] = { ++static const char *walker_5[] = { + /* width height ncolors chars_per_pixel */ + "40 52 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_5b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_5b.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_5b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_5b[] = { ++static const char *walker_5b[] = { + /* width height ncolors chars_per_pixel */ + "40 52 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_5c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_5c.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_5c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_5c[] = { ++static const char *walker_5c[] = { + /* width height ncolors chars_per_pixel */ + "40 52 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/walker/walker_5d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/walker/walker_5d.xpm ++++ xevil-2.02r2/x11/gen_xpm/walker/walker_5d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *walker_5d[] = { ++static const char *walker_5d[] = { + /* width height ncolors chars_per_pixel */ + "40 52 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/weight/weight_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/weight/weight_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/weight/weight_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *weight_4[] = { ++static const char *weight_4[] = { + /* width height ncolors chars_per_pixel */ + "28 30 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_0[] = { ++static const char *background_0[] = { + /* width height ncolors chars_per_pixel */ + "100 100 27 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_1.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_1.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_1.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_1[] = { ++static const char *background_1[] = { + /* width height ncolors chars_per_pixel */ + "100 100 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_10.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_10.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_10.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_10[] = { ++static const char *background_10[] = { + /* width height ncolors chars_per_pixel */ + "128 128 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_11.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_11.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_11.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_11[] = { ++static const char *background_11[] = { + /* width height ncolors chars_per_pixel */ + "128 128 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_12.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_12.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_12.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_12[] = { ++static const char *background_12[] = { + /* width height ncolors chars_per_pixel */ + "128 128 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_13.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_13.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_13.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_13[] = { ++static const char *background_13[] = { + /* width height ncolors chars_per_pixel */ + "128 128 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_2[] = { ++static const char *background_2[] = { + /* width height ncolors chars_per_pixel */ + "100 100 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_3.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_3.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_3.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_3[] = { ++static const char *background_3[] = { + /* width height ncolors chars_per_pixel */ + "100 100 27 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_4[] = { ++static const char *background_4[] = { + /* width height ncolors chars_per_pixel */ + "100 100 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_5[] = { ++static const char *background_5[] = { + /* width height ncolors chars_per_pixel */ + "100 100 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_6.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_6.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_6.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_6[] = { ++static const char *background_6[] = { + /* width height ncolors chars_per_pixel */ + "64 64 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_7.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_7.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_7.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_7[] = { ++static const char *background_7[] = { + /* width height ncolors chars_per_pixel */ + "94 94 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_8.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_8.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_8.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_8[] = { ++static const char *background_8[] = { + /* width height ncolors chars_per_pixel */ + "128 128 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/background_9.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/background_9.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/background_9.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *background_9[] = { ++static const char *background_9[] = { + /* width height ncolors chars_per_pixel */ + "128 128 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_0[] = { ++static const char *block_0[] = { + /* width height ncolors chars_per_pixel */ + "32 32 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_1.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_1.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_1.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_1[] = { ++static const char *block_1[] = { + /* width height ncolors chars_per_pixel */ + "32 32 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_10.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_10.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_10.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_10[] = { ++static const char *block_10[] = { + /* width height ncolors chars_per_pixel */ + "32 32 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_11.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_11.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_11.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_11[] = { ++static const char *block_11[] = { + /* width height ncolors chars_per_pixel */ + "32 32 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_12.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_12.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_12.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_12[] = { ++static const char *block_12[] = { + /* width height ncolors chars_per_pixel */ + "32 32 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_13.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_13.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_13.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_13[] = { ++static const char *block_13[] = { + /* width height ncolors chars_per_pixel */ + "32 32 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_14.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_14.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_14.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_14[] = { ++static const char *block_14[] = { + /* width height ncolors chars_per_pixel */ + "32 32 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_15.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_15.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_15.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_15[] = { ++static const char *block_15[] = { + /* width height ncolors chars_per_pixel */ + "32 32 18 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_16.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_16.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_16.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_16[] = { ++static const char *block_16[] = { + /* width height ncolors chars_per_pixel */ + "32 32 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_17.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_17.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_17.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_17[] = { ++static const char *block_17[] = { + /* width height ncolors chars_per_pixel */ + "32 32 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_18.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_18.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_18.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_18[] = { ++static const char *block_18[] = { + /* width height ncolors chars_per_pixel */ + "32 32 16 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_19.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_19.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_19.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_19[] = { ++static const char *block_19[] = { + /* width height ncolors chars_per_pixel */ + "32 32 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_2[] = { ++static const char *block_2[] = { + /* width height ncolors chars_per_pixel */ + "32 32 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_20.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_20.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_20.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_20[] = { ++static const char *block_20[] = { + /* width height ncolors chars_per_pixel */ + "32 32 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_21.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_21.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_21.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_21[] = { ++static const char *block_21[] = { + /* width height ncolors chars_per_pixel */ + "32 32 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_3.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_3.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_3.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_3[] = { ++static const char *block_3[] = { + /* width height ncolors chars_per_pixel */ + "32 32 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_4[] = { ++static const char *block_4[] = { + /* width height ncolors chars_per_pixel */ + "32 32 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_5[] = { ++static const char *block_5[] = { + /* width height ncolors chars_per_pixel */ + "32 32 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_6.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_6.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_6.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_6[] = { ++static const char *block_6[] = { + /* width height ncolors chars_per_pixel */ + "32 32 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_7.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_7.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_7.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_7[] = { ++static const char *block_7[] = { + /* width height ncolors chars_per_pixel */ + "32 32 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_8.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_8.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_8.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_8[] = { ++static const char *block_8[] = { + /* width height ncolors chars_per_pixel */ + "32 32 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/block_9.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/block_9.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/block_9.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *block_9[] = { ++static const char *block_9[] = { + /* width height ncolors chars_per_pixel */ + "32 32 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/door_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/door_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/door_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *door_0[] = { ++static const char *door_0[] = { + /* width height ncolors chars_per_pixel */ + "32 32 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/door_1.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/door_1.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/door_1.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *door_1[] = { ++static const char *door_1[] = { + /* width height ncolors chars_per_pixel */ + "32 32 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/door_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/door_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/door_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *door_2[] = { ++static const char *door_2[] = { + /* width height ncolors chars_per_pixel */ + "32 32 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/door_3.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/door_3.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/door_3.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *door_3[] = { ++static const char *door_3[] = { + /* width height ncolors chars_per_pixel */ + "32 32 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/door_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/door_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/door_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *door_4[] = { ++static const char *door_4[] = { + /* width height ncolors chars_per_pixel */ + "32 32 15 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/door_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/door_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/door_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *door_5[] = { ++static const char *door_5[] = { + /* width height ncolors chars_per_pixel */ + "32 32 14 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/door_6.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/door_6.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/door_6.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *door_6[] = { ++static const char *door_6[] = { + /* width height ncolors chars_per_pixel */ + "32 32 16 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/door_7.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/door_7.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/door_7.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *door_7[] = { ++static const char *door_7[] = { + /* width height ncolors chars_per_pixel */ + "32 32 17 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/door_8.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/door_8.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/door_8.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *door_8[] = { ++static const char *door_8[] = { + /* width height ncolors chars_per_pixel */ + "32 32 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/door_9.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/door_9.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/door_9.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *door_9[] = { ++static const char *door_9[] = { + /* width height ncolors chars_per_pixel */ + "32 32 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_0[] = { ++static const char *mover_0[] = { + /* width height ncolors chars_per_pixel */ + "64 32 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_1.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_1.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_1.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_1[] = { ++static const char *mover_1[] = { + /* width height ncolors chars_per_pixel */ + "64 32 14 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_2[] = { ++static const char *mover_2[] = { + /* width height ncolors chars_per_pixel */ + "64 32 16 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_3.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_3.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_3.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_3[] = { ++static const char *mover_3[] = { + /* width height ncolors chars_per_pixel */ + "64 32 25 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_4[] = { ++static const char *mover_4[] = { + /* width height ncolors chars_per_pixel */ + "64 32 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_square_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_square_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_square_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_square_0[] = { ++static const char *mover_square_0[] = { + /* width height ncolors chars_per_pixel */ + "32 32 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_square_1.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_square_1.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_square_1.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_square_1[] = { ++static const char *mover_square_1[] = { + /* width height ncolors chars_per_pixel */ + "32 32 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_square_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_square_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_square_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_square_2[] = { ++static const char *mover_square_2[] = { + /* width height ncolors chars_per_pixel */ + "32 32 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_square_3.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_square_3.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_square_3.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_square_3[] = { ++static const char *mover_square_3[] = { + /* width height ncolors chars_per_pixel */ + "32 32 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_square_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_square_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_square_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_square_4[] = { ++static const char *mover_square_4[] = { + /* width height ncolors chars_per_pixel */ + "32 32 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_square_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_square_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_square_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_square_5[] = { ++static const char *mover_square_5[] = { + /* width height ncolors chars_per_pixel */ + "32 32 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_square_6.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_square_6.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_square_6.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_square_6[] = { ++static const char *mover_square_6[] = { + /* width height ncolors chars_per_pixel */ + "32 32 11 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_square_7.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_square_7.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_square_7.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_square_7[] = { ++static const char *mover_square_7[] = { + /* width height ncolors chars_per_pixel */ + "32 32 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_square_8.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_square_8.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_square_8.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_square_8[] = { ++static const char *mover_square_8[] = { + /* width height ncolors chars_per_pixel */ + "32 32 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/mover_square_9.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/mover_square_9.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/mover_square_9.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *mover_square_9[] = { ++static const char *mover_square_9[] = { + /* width height ncolors chars_per_pixel */ + "32 32 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/outside_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/outside_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/outside_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *outside_0[] = { ++static const char *outside_0[] = { + /* width height ncolors chars_per_pixel */ + "100 100 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/outside_1.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/outside_1.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/outside_1.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *outside_1[] = { ++static const char *outside_1[] = { + /* width height ncolors chars_per_pixel */ + "100 100 5 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/outside_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/outside_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/outside_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *outside_2[] = { ++static const char *outside_2[] = { + /* width height ncolors chars_per_pixel */ + "100 100 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/outside_3.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/outside_3.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/outside_3.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *outside_3[] = { ++static const char *outside_3[] = { + /* width height ncolors chars_per_pixel */ + "128 128 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/outside_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/outside_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/outside_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *outside_4[] = { ++static const char *outside_4[] = { + /* width height ncolors chars_per_pixel */ + "128 128 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/outside_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/outside_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/outside_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *outside_5[] = { ++static const char *outside_5[] = { + /* width height ncolors chars_per_pixel */ + "96 96 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_0[] = { ++static const char *poster_0[] = { + /* width height ncolors chars_per_pixel */ + "160 96 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_1.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_1.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_1.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_1[] = { ++static const char *poster_1[] = { + /* width height ncolors chars_per_pixel */ + "64 64 9 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_10.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_10.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_10.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_10[] = { ++static const char *poster_10[] = { + /* width height ncolors chars_per_pixel */ + "96 96 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_11.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_11.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_11.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_11[] = { ++static const char *poster_11[] = { + /* width height ncolors chars_per_pixel */ + "128 64 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_12.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_12.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_12.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_12[] = { ++static const char *poster_12[] = { + /* width height ncolors chars_per_pixel */ + "32 32 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_13.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_13.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_13.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_13[] = { ++static const char *poster_13[] = { + /* width height ncolors chars_per_pixel */ + "352 160 64 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_2[] = { ++static const char *poster_2[] = { + /* width height ncolors chars_per_pixel */ + "32 32 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_3.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_3.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_3.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_3[] = { ++static const char *poster_3[] = { + /* width height ncolors chars_per_pixel */ + "96 96 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_4[] = { ++static const char *poster_4[] = { + /* width height ncolors chars_per_pixel */ + "64 32 8 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_5[] = { ++static const char *poster_5[] = { + /* width height ncolors chars_per_pixel */ + "64 64 3 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_6.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_6.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_6.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_6[] = { ++static const char *poster_6[] = { + /* width height ncolors chars_per_pixel */ + "64 64 4 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_7.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_7.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_7.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_7[] = { ++static const char *poster_7[] = { + /* width height ncolors chars_per_pixel */ + "64 64 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_8.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_8.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_8.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_8[] = { ++static const char *poster_8[] = { + /* width height ncolors chars_per_pixel */ + "32 32 6 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/world/poster_9.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/world/poster_9.xpm ++++ xevil-2.02r2/x11/gen_xpm/world/poster_9.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *poster_9[] = { ++static const char *poster_9[] = { + /* width height ncolors chars_per_pixel */ + "128 32 7 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_0.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_0.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_0.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_0[] = { ++static const char *yeti_0[] = { + /* width height ncolors chars_per_pixel */ + "48 50 14 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_0b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_0b.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_0b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_0b[] = { ++static const char *yeti_0b[] = { + /* width height ncolors chars_per_pixel */ + "48 50 14 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_0c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_0c.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_0c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_0c[] = { ++static const char *yeti_0c[] = { + /* width height ncolors chars_per_pixel */ + "48 50 14 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_0d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_0d.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_0d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_0d[] = { ++static const char *yeti_0d[] = { + /* width height ncolors chars_per_pixel */ + "48 50 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_10.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_10.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_10.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_10[] = { ++static const char *yeti_10[] = { + /* width height ncolors chars_per_pixel */ + "50 38 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_10b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_10b.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_10b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_10b[] = { ++static const char *yeti_10b[] = { + /* width height ncolors chars_per_pixel */ + "50 38 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_10c.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_10c.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_10c.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_10c[] = { ++static const char *yeti_10c[] = { + /* width height ncolors chars_per_pixel */ + "50 38 12 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_10d.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_10d.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_10d.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_10d[] = { ++static const char *yeti_10d[] = { + /* width height ncolors chars_per_pixel */ + "50 38 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_10e.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_10e.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_10e.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_10e[] = { ++static const char *yeti_10e[] = { + /* width height ncolors chars_per_pixel */ + "50 38 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_10f.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_10f.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_10f.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_10f[] = { ++static const char *yeti_10f[] = { + /* width height ncolors chars_per_pixel */ + "50 38 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_18.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_18.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_18.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_18[] = { ++static const char *yeti_18[] = { + /* width height ncolors chars_per_pixel */ + "32 50 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_2.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_2.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_2.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_2[] = { ++static const char *yeti_2[] = { + /* width height ncolors chars_per_pixel */ + "50 50 15 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_20b.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_20b.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_20b.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_20b[] = { ++static const char *yeti_20b[] = { + /* width height ncolors chars_per_pixel */ + "32 50 10 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_25.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_25.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_25.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_25[] = { ++static const char *yeti_25[] = { + /* width height ncolors chars_per_pixel */ + "50 20 17 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_4.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_4.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_4.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_4[] = { ++static const char *yeti_4[] = { + /* width height ncolors chars_per_pixel */ + "44 50 14 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_5.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_5.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_5.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_5[] = { ++static const char *yeti_5[] = { + /* width height ncolors chars_per_pixel */ + "44 50 13 1 0 0", + /* colors */ +Index: xevil-2.02r2/x11/gen_xpm/yeti/yeti_9.xpm +=================================================================== +--- xevil-2.02r2.orig/x11/gen_xpm/yeti/yeti_9.xpm ++++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_9.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *yeti_9[] = { ++static const char *yeti_9[] = { + /* width height ncolors chars_per_pixel */ + "40 38 14 1 0 0", + /* colors */ diff -Nru xevil-2.02r2/debian/patches/series xevil-2.02r2/debian/patches/series --- xevil-2.02r2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ xevil-2.02r2/debian/patches/series 2022-01-12 13:15:35.000000000 +0000 @@ -0,0 +1,2 @@ +0001_port_to_gcc6.patch +0002_xpm_const.patch diff -Nru xevil-2.02r2/debian/rules xevil-2.02r2/debian/rules --- xevil-2.02r2/debian/rules 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/debian/rules 2022-01-12 13:15:35.000000000 +0000 @@ -5,67 +5,19 @@ DEBUG_OPT = -Wno-trigraphs -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - DEBUG_OPT += -O0 -else - DEBUG_OPT += -O2 -endif - -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - PARFLAGS = -j $(NUMJOBS) -endif - export FORCEHOSTTYPE=debian-linux -build: build-stamp -build-stamp: - dh_testdir - - $(MAKE) $(PARFLAGS) DEBUG_OPT="$(DEBUG_OPT)" - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - $(MAKE) clean - -rm -rf x11/release - -rm x11/bitmaps/ui/xevil.xpm - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - mv x11/release/serverping x11/release/xevil-serverping - dh_install x11/release/xevil x11/release/xevil-serverping usr/games - cp x11/bitmaps/ui/xevil_icon.xpm x11/bitmaps/ui/xevil.xpm - dh_install x11/bitmaps/ui/xevil.xpm usr/share/pixmaps +%: + dh $@ -binary-indep: build install +override_dh_auto_build: + dh_auto_build -- DEBUG_OPT="$(DEBUG_OPT) $(CFLAGS)" -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installmenu - dh_installman debian/xevil.6 debian/xevil-serverping.6 - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb +override_dh_auto_clean: + dh_auto_clean + rm -rf x11/release -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_auto_install: + mv x11/release/serverping x11/release/xevil-serverping + cp x11/bitmaps/ui/xevil_icon.xpm x11/bitmaps/ui/xevil.xpm + dh_auto_install diff -Nru xevil-2.02r2/debian/source/format xevil-2.02r2/debian/source/format --- xevil-2.02r2/debian/source/format 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/debian/source/format 2022-01-12 13:15:35.000000000 +0000 @@ -1 +1 @@ -1.0 +3.0 (quilt) diff -Nru xevil-2.02r2/debian/xevil.install xevil-2.02r2/debian/xevil.install --- xevil-2.02r2/debian/xevil.install 1970-01-01 00:00:00.000000000 +0000 +++ xevil-2.02r2/debian/xevil.install 2022-01-12 13:15:35.000000000 +0000 @@ -0,0 +1,3 @@ +x11/release/xevil usr/games +x11/release/xevil-serverping usr/games +x11/bitmaps/ui/xevil.xpm usr/share/pixmaps diff -Nru xevil-2.02r2/debian/xevil.manpages xevil-2.02r2/debian/xevil.manpages --- xevil-2.02r2/debian/xevil.manpages 1970-01-01 00:00:00.000000000 +0000 +++ xevil-2.02r2/debian/xevil.manpages 2022-01-12 13:15:35.000000000 +0000 @@ -0,0 +1,2 @@ +debian/xevil.6 +debian/xevil-serverping.6 diff -Nru xevil-2.02r2/makefile xevil-2.02r2/makefile --- xevil-2.02r2/makefile 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/makefile 2003-03-23 08:09:08.000000000 +0000 @@ -42,9 +42,9 @@ $(OBJ_DIR)/ui_cmn.o $(OBJ_DIR)/l_agreement_dlg.o $(OBJ_DIR)/viewport.o -#xevil: $(OBJ_DIR)/xevil $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z +xevil: $(OBJ_DIR)/xevil $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z #xevil: $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z -xevil: $(OBJ_DIR)/xevil +#xevil: $(OBJ_DIR)/xevil # Build the xevil executable. @@ -59,7 +59,7 @@ cd $(DEPTH)/cmn; $(MAKE) cd $(DEPTH)/x11; $(MAKE) $(CC) $(LINK_FLAGS) $(LINK_OPT) $(LIBS_DIRS) -o $(OBJ_DIR)/xevil $(ALL_OBJS) $(LIBS) -# $(STRIP) $(OBJ_DIR)/xevil + $(STRIP) $(OBJ_DIR)/xevil # Could also include serverping in the distribution $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z:: @@ -96,8 +96,8 @@ ## Remove executables and all junk. clean: - -/bin/rm -f $(OBJ_DIR)/* core */core - -rmdir $(OBJ_DIR) + /bin/rm -f $(OBJ_DIR)/* core */core + rmdir $(OBJ_DIR) # /bin/rm -f $(TARGETS) $(OBJS) core test test.o xshow.o xshow tildaclean: diff -Nru xevil-2.02r2/x11/bitmaps/ui/xevil_icon.xpm xevil-2.02r2/x11/bitmaps/ui/xevil_icon.xpm --- xevil-2.02r2/x11/bitmaps/ui/xevil_icon.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/bitmaps/ui/xevil_icon.xpm 1998-11-21 05:18:24.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *xevil_icon[] = { +static char *xevil_icon[] = { /* width height num_colors chars_per_pixel */ " 32 32 9 1", /* colors */ diff -Nru xevil-2.02r2/x11/draw.cpp xevil-2.02r2/x11/draw.cpp --- xevil-2.02r2/x11/draw.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/draw.cpp 2000-01-19 20:54:16.000000000 +0000 @@ -34,7 +34,6 @@ // in Xvars instead. #include "viewport.h" -using namespace std; // Draw functions for World @@ -328,7 +327,7 @@ Boolean val = xvars.load_pixmap(&xdata.blockPixmaps[dpyNum][n], mask,dpyNum, - (const char**)blocksBits[n]); + (char**)blocksBits[n]); if (!val) { cerr << "Failed to load block " << n << endl; } @@ -353,7 +352,7 @@ Boolean val = xvars.load_pixmap(&xdata.posterPixmaps[dpyNum][n], &xdata.posterMasks[dpyNum][n], - dpyNum,(const char**)posters[n].id); + dpyNum,(char**)posters[n].id); if (!val) { cerr << "Failed to load poster " << n << endl; } @@ -364,7 +363,7 @@ for (n = 0; n < W_ALL_DOORS_NUM; n++) { Boolean val = xvars.load_pixmap(&xdata.doorPixmaps[dpyNum][n],NULL,dpyNum, - (const char**)doorPixmapBits[n]); + (char**)doorPixmapBits[n]); if (!val) { cerr << "Failed to load door block " << n << endl; } @@ -377,7 +376,7 @@ xvars.load_pixmap(&xdata.moverSquarePixmaps[dpyNum][n], &xdata.moverSquareMasks[dpyNum][n], dpyNum, - (const char**)moverSquarePixmapBits[n]); + (char**)moverSquarePixmapBits[n]); if (!val) { cerr << "Failed to mover square " << n << endl; } @@ -401,7 +400,7 @@ xvars.load_pixmap(&xdata.moverPixmaps[dpyNum][n], &xdata.moverMasks[dpyNum][n], dpyNum, - (const char**)moverPixmapBits[n]); + (char**)moverPixmapBits[n]); if (!val) { cerr << "Failed to load mover " << n << endl; } @@ -412,7 +411,7 @@ for (n = 0; n < W_ALL_BACKGROUNDS_NUM; n++) { Boolean val = xvars.load_pixmap(&xdata.backgroundPixmaps[dpyNum][n],NULL,dpyNum, - (const char**)backgrounds[n].id); + (char**)backgrounds[n].id); if (!val) { cerr << "Failed to load background " << n << endl; } @@ -423,7 +422,7 @@ for (n = 0; n < W_ALL_OUTSIDES_NUM; n++) { Boolean val = xvars.load_pixmap(&xdata.outsidePixmaps[dpyNum][n],NULL,dpyNum, - (const char**)outsides[n].id); + (char**)outsides[n].id); if (!val) { cerr << "Failed to load outside " << n << endl; } @@ -690,7 +689,7 @@ assert(tickPixmapBits[tt][hp] != PH_AUTO_GEN); xvars.load_pixmap(&xdata.tickPixmaps[dpyNum][tt][hp], &xdata.tickMasks[dpyNum][tt][hp], - dpyNum,(const char**)tickPixmapBits[tt][hp]); + dpyNum,(char**)tickPixmapBits[tt][hp]); } } } @@ -1021,7 +1020,7 @@ for (dpyNum = 0; dpyNum < xvars.dpyMax; dpyNum++) { Boolean val = xvars.load_pixmap(&xdata.pixmap[dpyNum], &xdata.mask[dpyNum], - dpyNum,(const char**)fireBits); + dpyNum,(char**)fireBits); if (!val) { cerr << "Failed to load fire graphics." << endl; } @@ -1293,7 +1292,7 @@ Boolean val = xvars.load_pixmap(&movingXdata.pixmaps[dpyNum][n][m], &movingXdata.masks[dpyNum][n][m], - dpyNum,(const char**)mc.pixmapBits[n][m]); + dpyNum,(char**)mc.pixmapBits[n][m]); if (!val) { cerr << "load_pixmap() failed for " << mc.physicalContext.className diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_0b.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_0b.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_0b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_0b[] = { +static char *alien_0b[] = { /* width height ncolors chars_per_pixel */ "48 58 16 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_0c.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_0c.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_0c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_0c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_0c[] = { +static char *alien_0c[] = { /* width height ncolors chars_per_pixel */ "48 58 16 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_0d.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_0d.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_0d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_0d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_0d[] = { +static char *alien_0d[] = { /* width height ncolors chars_per_pixel */ "48 58 15 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_0e.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_0e.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_0e.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_0e.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_0e[] = { +static char *alien_0e[] = { /* width height ncolors chars_per_pixel */ "48 58 15 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_0f.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_0f.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_0f.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_0f.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_0f[] = { +static char *alien_0f[] = { /* width height ncolors chars_per_pixel */ "48 58 15 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_0.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_0.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_0.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_0[] = { +static char *alien_0[] = { /* width height ncolors chars_per_pixel */ "48 58 15 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_10b.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_10b.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_10b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_10b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_10b[] = { +static char *alien_10b[] = { /* width height ncolors chars_per_pixel */ "62 32 15 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_10c.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_10c.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_10c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_10c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_10c[] = { +static char *alien_10c[] = { /* width height ncolors chars_per_pixel */ "62 32 15 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_10d.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_10d.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_10d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_10d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_10d[] = { +static char *alien_10d[] = { /* width height ncolors chars_per_pixel */ "62 32 15 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_18.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_18.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_18.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_18.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_18[] = { +static char *alien_18[] = { /* width height ncolors chars_per_pixel */ "18 58 16 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_20b.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_20b.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_20b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_20b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_20b[] = { +static char *alien_20b[] = { /* width height ncolors chars_per_pixel */ "18 58 16 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_20c.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_20c.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_20c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_20c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_20c[] = { +static char *alien_20c[] = { /* width height ncolors chars_per_pixel */ "18 58 17 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_25.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_25.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_25.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_25[] = { +static char *alien_25[] = { /* width height ncolors chars_per_pixel */ "60 22 17 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_2.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_2.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_2.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_2[] = { +static char *alien_2[] = { /* width height ncolors chars_per_pixel */ "52 56 16 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_4.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_4.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_4.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_4[] = { +static char *alien_4[] = { /* width height ncolors chars_per_pixel */ "26 58 16 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_5.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_5.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_5.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_5[] = { +static char *alien_5[] = { /* width height ncolors chars_per_pixel */ "20 54 15 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/alien/alien_9.xpm xevil-2.02r2/x11/gen_xpm/alien/alien_9.xpm --- xevil-2.02r2/x11/gen_xpm/alien/alien_9.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/alien/alien_9.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *alien_9[] = { +static char *alien_9[] = { /* width height ncolors chars_per_pixel */ "62 32 15 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4b.xpm xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4b.xpm --- xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *altar_of_sin_4b[] = { +static char *altar_of_sin_4b[] = { /* width height ncolors chars_per_pixel */ "48 64 68 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4c.xpm xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4c.xpm --- xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *altar_of_sin_4c[] = { +static char *altar_of_sin_4c[] = { /* width height ncolors chars_per_pixel */ "48 64 67 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4.xpm xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4.xpm --- xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/altar_of_sin/altar_of_sin_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *altar_of_sin_4[] = { +static char *altar_of_sin_4[] = { /* width height ncolors chars_per_pixel */ "48 64 69 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/auto_lancer/auto_lancer_4.xpm xevil-2.02r2/x11/gen_xpm/auto_lancer/auto_lancer_4.xpm --- xevil-2.02r2/x11/gen_xpm/auto_lancer/auto_lancer_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/auto_lancer/auto_lancer_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *auto_lancer_4[] = { +static char *auto_lancer_4[] = { /* width height ncolors chars_per_pixel */ "40 12 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_0b.xpm xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_0b.xpm --- xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_0b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *baby_seal_0b[] = { +static char *baby_seal_0b[] = { /* width height ncolors chars_per_pixel */ "28 22 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_0.xpm xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_0.xpm --- xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_0.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *baby_seal_0[] = { +static char *baby_seal_0[] = { /* width height ncolors chars_per_pixel */ "28 22 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_25.xpm xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_25.xpm --- xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_25.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *baby_seal_25[] = { +static char *baby_seal_25[] = { /* width height ncolors chars_per_pixel */ "38 8 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_4.xpm xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_4.xpm --- xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/baby_seal/baby_seal_4.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *baby_seal_4[] = { +static char *baby_seal_4[] = { /* width height ncolors chars_per_pixel */ "22 22 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/blood/blood_25.xpm xevil-2.02r2/x11/gen_xpm/blood/blood_25.xpm --- xevil-2.02r2/x11/gen_xpm/blood/blood_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/blood/blood_25.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *blood_25[] = { +static char *blood_25[] = { /* width height ncolors chars_per_pixel */ "14 4 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/blood/blood_39.xpm xevil-2.02r2/x11/gen_xpm/blood/blood_39.xpm --- xevil-2.02r2/x11/gen_xpm/blood/blood_39.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/blood/blood_39.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *blood_39[] = { +static char *blood_39[] = { /* width height ncolors chars_per_pixel */ "10 10 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/blood/blood_40.xpm xevil-2.02r2/x11/gen_xpm/blood/blood_40.xpm --- xevil-2.02r2/x11/gen_xpm/blood/blood_40.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/blood/blood_40.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *blood_40[] = { +static char *blood_40[] = { /* width height ncolors chars_per_pixel */ "12 8 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/blood/blood_4.xpm xevil-2.02r2/x11/gen_xpm/blood/blood_4.xpm --- xevil-2.02r2/x11/gen_xpm/blood/blood_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/blood/blood_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *blood_4[] = { +static char *blood_4[] = { /* width height ncolors chars_per_pixel */ "4 8 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/blood/blood_9.xpm xevil-2.02r2/x11/gen_xpm/blood/blood_9.xpm --- xevil-2.02r2/x11/gen_xpm/blood/blood_9.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/blood/blood_9.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *blood_9[] = { +static char *blood_9[] = { /* width height ncolors chars_per_pixel */ "14 2 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/bomb/bomb_25b.xpm xevil-2.02r2/x11/gen_xpm/bomb/bomb_25b.xpm --- xevil-2.02r2/x11/gen_xpm/bomb/bomb_25b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_25b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *bomb_25b[] = { +static char *bomb_25b[] = { /* width height ncolors chars_per_pixel */ "28 26 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/bomb/bomb_25.xpm xevil-2.02r2/x11/gen_xpm/bomb/bomb_25.xpm --- xevil-2.02r2/x11/gen_xpm/bomb/bomb_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_25.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *bomb_25[] = { +static char *bomb_25[] = { /* width height ncolors chars_per_pixel */ "28 26 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/bomb/bomb_26.xpm xevil-2.02r2/x11/gen_xpm/bomb/bomb_26.xpm --- xevil-2.02r2/x11/gen_xpm/bomb/bomb_26.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_26.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *bomb_26[] = { +static char *bomb_26[] = { /* width height ncolors chars_per_pixel */ "28 26 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/bomb/bomb_27.xpm xevil-2.02r2/x11/gen_xpm/bomb/bomb_27.xpm --- xevil-2.02r2/x11/gen_xpm/bomb/bomb_27.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_27.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *bomb_27[] = { +static char *bomb_27[] = { /* width height ncolors chars_per_pixel */ "28 26 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/bomb/bomb_28.xpm xevil-2.02r2/x11/gen_xpm/bomb/bomb_28.xpm --- xevil-2.02r2/x11/gen_xpm/bomb/bomb_28.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_28.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *bomb_28[] = { +static char *bomb_28[] = { /* width height ncolors chars_per_pixel */ "28 26 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/bomb/bomb_29.xpm xevil-2.02r2/x11/gen_xpm/bomb/bomb_29.xpm --- xevil-2.02r2/x11/gen_xpm/bomb/bomb_29.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_29.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *bomb_29[] = { +static char *bomb_29[] = { /* width height ncolors chars_per_pixel */ "28 26 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/bomb/bomb_30.xpm xevil-2.02r2/x11/gen_xpm/bomb/bomb_30.xpm --- xevil-2.02r2/x11/gen_xpm/bomb/bomb_30.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_30.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *bomb_30[] = { +static char *bomb_30[] = { /* width height ncolors chars_per_pixel */ "28 26 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/bomb/bomb_31.xpm xevil-2.02r2/x11/gen_xpm/bomb/bomb_31.xpm --- xevil-2.02r2/x11/gen_xpm/bomb/bomb_31.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/bomb/bomb_31.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *bomb_31[] = { +static char *bomb_31[] = { /* width height ncolors chars_per_pixel */ "28 26 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/caffine/caffine_4.xpm xevil-2.02r2/x11/gen_xpm/caffine/caffine_4.xpm --- xevil-2.02r2/x11/gen_xpm/caffine/caffine_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/caffine/caffine_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *caffine_4[] = { +static char *caffine_4[] = { /* width height ncolors chars_per_pixel */ "12 22 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0b.xpm xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0b.xpm --- xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chainsaw_0b[] = { +static char *chainsaw_0b[] = { /* width height ncolors chars_per_pixel */ "38 18 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0c.xpm xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0c.xpm --- xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chainsaw_0c[] = { +static char *chainsaw_0c[] = { /* width height ncolors chars_per_pixel */ "38 18 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0.xpm xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0.xpm --- xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chainsaw_0[] = { +static char *chainsaw_0[] = { /* width height ncolors chars_per_pixel */ "38 18 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1b.xpm xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1b.xpm --- xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chainsaw_1b[] = { +static char *chainsaw_1b[] = { /* width height ncolors chars_per_pixel */ "38 18 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1c.xpm xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1c.xpm --- xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chainsaw_1c[] = { +static char *chainsaw_1c[] = { /* width height ncolors chars_per_pixel */ "38 18 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1.xpm xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1.xpm --- xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_1.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chainsaw_1[] = { +static char *chainsaw_1[] = { /* width height ncolors chars_per_pixel */ "38 18 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_4b.xpm xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_4b.xpm --- xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_4b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chainsaw_4b[] = { +static char *chainsaw_4b[] = { /* width height ncolors chars_per_pixel */ "18 38 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_4.xpm xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_4.xpm --- xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chainsaw_4[] = { +static char *chainsaw_4[] = { /* width height ncolors chars_per_pixel */ "18 38 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_5b.xpm xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_5b.xpm --- xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_5b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_5b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chainsaw_5b[] = { +static char *chainsaw_5b[] = { /* width height ncolors chars_per_pixel */ "12 18 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_5.xpm xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_5.xpm --- xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_5.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chainsaw_5[] = { +static char *chainsaw_5[] = { /* width height ncolors chars_per_pixel */ "12 18 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_7b.xpm xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_7b.xpm --- xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_7b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_7b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chainsaw_7b[] = { +static char *chainsaw_7b[] = { /* width height ncolors chars_per_pixel */ "18 38 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_7.xpm xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_7.xpm --- xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_7.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chainsaw/chainsaw_7.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chainsaw_7[] = { +static char *chainsaw_7[] = { /* width height ncolors chars_per_pixel */ "18 38 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0b.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0b.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_0b[] = { +static char *chopper_boy_0b[] = { /* width height ncolors chars_per_pixel */ "28 40 45 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0c.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0c.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_0c[] = { +static char *chopper_boy_0c[] = { /* width height ncolors chars_per_pixel */ "28 40 47 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0d.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0d.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_0d[] = { +static char *chopper_boy_0d[] = { /* width height ncolors chars_per_pixel */ "28 40 42 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0e.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0e.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0e.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0e.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_0e[] = { +static char *chopper_boy_0e[] = { /* width height ncolors chars_per_pixel */ "28 40 47 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0f.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0f.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0f.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0f.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_0f[] = { +static char *chopper_boy_0f[] = { /* width height ncolors chars_per_pixel */ "28 40 49 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_0.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_0[] = { +static char *chopper_boy_0[] = { /* width height ncolors chars_per_pixel */ "28 40 42 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21b.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21b.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_21b[] = { +static char *chopper_boy_21b[] = { /* width height ncolors chars_per_pixel */ "26 40 58 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21c.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21c.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_21c[] = { +static char *chopper_boy_21c[] = { /* width height ncolors chars_per_pixel */ "26 40 58 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21d.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21d.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_21d[] = { +static char *chopper_boy_21d[] = { /* width height ncolors chars_per_pixel */ "26 40 59 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_21.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_21[] = { +static char *chopper_boy_21[] = { /* width height ncolors chars_per_pixel */ "26 40 57 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22b.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22b.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_22b[] = { +static char *chopper_boy_22b[] = { /* width height ncolors chars_per_pixel */ "26 40 59 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22c.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22c.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_22c[] = { +static char *chopper_boy_22c[] = { /* width height ncolors chars_per_pixel */ "26 40 59 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22d.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22d.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_22d[] = { +static char *chopper_boy_22d[] = { /* width height ncolors chars_per_pixel */ "26 40 60 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_22.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_22[] = { +static char *chopper_boy_22[] = { /* width height ncolors chars_per_pixel */ "26 40 58 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_25.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_25.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_25.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_25[] = { +static char *chopper_boy_25[] = { /* width height ncolors chars_per_pixel */ "38 18 43 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2b.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2b.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_2b[] = { +static char *chopper_boy_2b[] = { /* width height ncolors chars_per_pixel */ "24 40 42 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2c.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2c.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_2c[] = { +static char *chopper_boy_2c[] = { /* width height ncolors chars_per_pixel */ "24 40 41 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2d.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2d.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_2d[] = { +static char *chopper_boy_2d[] = { /* width height ncolors chars_per_pixel */ "24 40 42 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_2.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_2[] = { +static char *chopper_boy_2[] = { /* width height ncolors chars_per_pixel */ "24 40 41 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4b.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4b.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_4b[] = { +static char *chopper_boy_4b[] = { /* width height ncolors chars_per_pixel */ "26 40 59 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4c.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4c.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_4c[] = { +static char *chopper_boy_4c[] = { /* width height ncolors chars_per_pixel */ "26 40 59 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4d.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4d.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_4d[] = { +static char *chopper_boy_4d[] = { /* width height ncolors chars_per_pixel */ "26 40 60 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_4.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_4[] = { +static char *chopper_boy_4[] = { /* width height ncolors chars_per_pixel */ "26 40 58 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_5.xpm xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_5.xpm --- xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/chopper_boy/chopper_boy_5.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *chopper_boy_5[] = { +static char *chopper_boy_5[] = { /* width height ncolors chars_per_pixel */ "26 40 55 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/cloak/cloak_4b.xpm xevil-2.02r2/x11/gen_xpm/cloak/cloak_4b.xpm --- xevil-2.02r2/x11/gen_xpm/cloak/cloak_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/cloak/cloak_4b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *cloak_4b[] = { +static char *cloak_4b[] = { /* width height ncolors chars_per_pixel */ "30 30 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/cloak/cloak_4c.xpm xevil-2.02r2/x11/gen_xpm/cloak/cloak_4c.xpm --- xevil-2.02r2/x11/gen_xpm/cloak/cloak_4c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/cloak/cloak_4c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *cloak_4c[] = { +static char *cloak_4c[] = { /* width height ncolors chars_per_pixel */ "30 30 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/cloak/cloak_4d.xpm xevil-2.02r2/x11/gen_xpm/cloak/cloak_4d.xpm --- xevil-2.02r2/x11/gen_xpm/cloak/cloak_4d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/cloak/cloak_4d.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *cloak_4d[] = { +static char *cloak_4d[] = { /* width height ncolors chars_per_pixel */ "30 30 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/cloak/cloak_4e.xpm xevil-2.02r2/x11/gen_xpm/cloak/cloak_4e.xpm --- xevil-2.02r2/x11/gen_xpm/cloak/cloak_4e.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/cloak/cloak_4e.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *cloak_4e[] = { +static char *cloak_4e[] = { /* width height ncolors chars_per_pixel */ "30 30 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/cloak/cloak_4f.xpm xevil-2.02r2/x11/gen_xpm/cloak/cloak_4f.xpm --- xevil-2.02r2/x11/gen_xpm/cloak/cloak_4f.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/cloak/cloak_4f.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *cloak_4f[] = { +static char *cloak_4f[] = { /* width height ncolors chars_per_pixel */ "30 30 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/cloak/cloak_4.xpm xevil-2.02r2/x11/gen_xpm/cloak/cloak_4.xpm --- xevil-2.02r2/x11/gen_xpm/cloak/cloak_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/cloak/cloak_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *cloak_4[] = { +static char *cloak_4[] = { /* width height ncolors chars_per_pixel */ "30 30 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/crack_pipe/crack_pipe_4.xpm xevil-2.02r2/x11/gen_xpm/crack_pipe/crack_pipe_4.xpm --- xevil-2.02r2/x11/gen_xpm/crack_pipe/crack_pipe_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/crack_pipe/crack_pipe_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *crack_pipe_4[] = { +static char *crack_pipe_4[] = { /* width height ncolors chars_per_pixel */ "20 10 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/demon_summoner/demon_summoner_4.xpm xevil-2.02r2/x11/gen_xpm/demon_summoner/demon_summoner_4.xpm --- xevil-2.02r2/x11/gen_xpm/demon_summoner/demon_summoner_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/demon_summoner/demon_summoner_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *demon_summoner_4[] = { +static char *demon_summoner_4[] = { /* width height ncolors chars_per_pixel */ "10 26 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_0b.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_0b.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_0b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_0b[] = { +static char *dog_0b[] = { /* width height ncolors chars_per_pixel */ "24 20 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_0.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_0.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_0.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_0[] = { +static char *dog_0[] = { /* width height ncolors chars_per_pixel */ "24 20 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_19b.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_19b.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_19b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_19b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_19b[] = { +static char *dog_19b[] = { /* width height ncolors chars_per_pixel */ "20 24 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_19.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_19.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_19.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_19.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_19[] = { +static char *dog_19[] = { /* width height ncolors chars_per_pixel */ "20 24 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_20b.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_20b.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_20b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_20b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_20b[] = { +static char *dog_20b[] = { /* width height ncolors chars_per_pixel */ "20 24 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_25.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_25.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_25.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_25[] = { +static char *dog_25[] = { /* width height ncolors chars_per_pixel */ "24 14 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_26.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_26.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_26.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_26.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_26[] = { +static char *dog_26[] = { /* width height ncolors chars_per_pixel */ "24 20 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_28.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_28.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_28.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_28.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_28[] = { +static char *dog_28[] = { /* width height ncolors chars_per_pixel */ "24 18 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_2.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_2.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_2.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_2[] = { +static char *dog_2[] = { /* width height ncolors chars_per_pixel */ "24 18 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_38.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_38.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_38.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_38.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_38[] = { +static char *dog_38[] = { /* width height ncolors chars_per_pixel */ "18 24 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_39.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_39.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_39.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_39.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_39[] = { +static char *dog_39[] = { /* width height ncolors chars_per_pixel */ "18 24 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_4.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_4.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_4.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_4[] = { +static char *dog_4[] = { /* width height ncolors chars_per_pixel */ "20 24 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_5b.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_5b.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_5b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_5b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_5b[] = { +static char *dog_5b[] = { /* width height ncolors chars_per_pixel */ "10 20 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog/dog_5.xpm xevil-2.02r2/x11/gen_xpm/dog/dog_5.xpm --- xevil-2.02r2/x11/gen_xpm/dog/dog_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog/dog_5.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_5[] = { +static char *dog_5[] = { /* width height ncolors chars_per_pixel */ "10 20 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dog_whistle/dog_whistle_4.xpm xevil-2.02r2/x11/gen_xpm/dog_whistle/dog_whistle_4.xpm --- xevil-2.02r2/x11/gen_xpm/dog_whistle/dog_whistle_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dog_whistle/dog_whistle_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dog_whistle_4[] = { +static char *dog_whistle_4[] = { /* width height ncolors chars_per_pixel */ "8 26 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/doppelganger/doppelganger_4b.xpm xevil-2.02r2/x11/gen_xpm/doppelganger/doppelganger_4b.xpm --- xevil-2.02r2/x11/gen_xpm/doppelganger/doppelganger_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/doppelganger/doppelganger_4b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *doppelganger_4b[] = { +static char *doppelganger_4b[] = { /* width height ncolors chars_per_pixel */ "22 24 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/doppelganger/doppelganger_4.xpm xevil-2.02r2/x11/gen_xpm/doppelganger/doppelganger_4.xpm --- xevil-2.02r2/x11/gen_xpm/doppelganger/doppelganger_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/doppelganger/doppelganger_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *doppelganger_4[] = { +static char *doppelganger_4[] = { /* width height ncolors chars_per_pixel */ "22 24 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dragon/dragon_0.xpm xevil-2.02r2/x11/gen_xpm/dragon/dragon_0.xpm --- xevil-2.02r2/x11/gen_xpm/dragon/dragon_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dragon/dragon_0.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dragon_0[] = { +static char *dragon_0[] = { /* width height ncolors chars_per_pixel */ "56 58 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dragon/dragon_25.xpm xevil-2.02r2/x11/gen_xpm/dragon/dragon_25.xpm --- xevil-2.02r2/x11/gen_xpm/dragon/dragon_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dragon/dragon_25.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dragon_25[] = { +static char *dragon_25[] = { /* width height ncolors chars_per_pixel */ "56 28 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dragon/dragon_26b.xpm xevil-2.02r2/x11/gen_xpm/dragon/dragon_26b.xpm --- xevil-2.02r2/x11/gen_xpm/dragon/dragon_26b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dragon/dragon_26b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dragon_26b[] = { +static char *dragon_26b[] = { /* width height ncolors chars_per_pixel */ "56 58 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dragon/dragon_26c.xpm xevil-2.02r2/x11/gen_xpm/dragon/dragon_26c.xpm --- xevil-2.02r2/x11/gen_xpm/dragon/dragon_26c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dragon/dragon_26c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dragon_26c[] = { +static char *dragon_26c[] = { /* width height ncolors chars_per_pixel */ "56 58 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dragon/dragon_26d.xpm xevil-2.02r2/x11/gen_xpm/dragon/dragon_26d.xpm --- xevil-2.02r2/x11/gen_xpm/dragon/dragon_26d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dragon/dragon_26d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dragon_26d[] = { +static char *dragon_26d[] = { /* width height ncolors chars_per_pixel */ "56 58 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/dragon/dragon_26.xpm xevil-2.02r2/x11/gen_xpm/dragon/dragon_26.xpm --- xevil-2.02r2/x11/gen_xpm/dragon/dragon_26.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/dragon/dragon_26.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *dragon_26[] = { +static char *dragon_26[] = { /* width height ncolors chars_per_pixel */ "56 58 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/egg/egg_4.xpm xevil-2.02r2/x11/gen_xpm/egg/egg_4.xpm --- xevil-2.02r2/x11/gen_xpm/egg/egg_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/egg/egg_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *egg_4[] = { +static char *egg_4[] = { /* width height ncolors chars_per_pixel */ "20 30 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/egg/egg_5.xpm xevil-2.02r2/x11/gen_xpm/egg/egg_5.xpm --- xevil-2.02r2/x11/gen_xpm/egg/egg_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/egg/egg_5.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *egg_5[] = { +static char *egg_5[] = { /* width height ncolors chars_per_pixel */ "20 30 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0b.xpm xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0b.xpm --- xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *enforcer_0b[] = { +static char *enforcer_0b[] = { /* width height ncolors chars_per_pixel */ "32 60 41 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0c.xpm xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0c.xpm --- xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *enforcer_0c[] = { +static char *enforcer_0c[] = { /* width height ncolors chars_per_pixel */ "32 60 43 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0.xpm xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0.xpm --- xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *enforcer_0[] = { +static char *enforcer_0[] = { /* width height ncolors chars_per_pixel */ "32 60 41 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_25.xpm xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_25.xpm --- xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_25.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *enforcer_25[] = { +static char *enforcer_25[] = { /* width height ncolors chars_per_pixel */ "60 32 41 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_4.xpm xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_4.xpm --- xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/enforcer/enforcer_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *enforcer_4[] = { +static char *enforcer_4[] = { /* width height ncolors chars_per_pixel */ "32 60 34 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/exit/exit_4.xpm xevil-2.02r2/x11/gen_xpm/exit/exit_4.xpm --- xevil-2.02r2/x11/gen_xpm/exit/exit_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/exit/exit_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *exit_4[] = { +static char *exit_4[] = { /* width height ncolors chars_per_pixel */ "60 60 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/fire/fire_4.xpm xevil-2.02r2/x11/gen_xpm/fire/fire_4.xpm --- xevil-2.02r2/x11/gen_xpm/fire/fire_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/fire/fire_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *fire_4[] = { +static char *fire_4[] = { /* width height ncolors chars_per_pixel */ "42 42 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/fireball/fireball_4b.xpm xevil-2.02r2/x11/gen_xpm/fireball/fireball_4b.xpm --- xevil-2.02r2/x11/gen_xpm/fireball/fireball_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/fireball/fireball_4b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *fireball_4b[] = { +static char *fireball_4b[] = { /* width height ncolors chars_per_pixel */ "48 48 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/fireball/fireball_4c.xpm xevil-2.02r2/x11/gen_xpm/fireball/fireball_4c.xpm --- xevil-2.02r2/x11/gen_xpm/fireball/fireball_4c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/fireball/fireball_4c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *fireball_4c[] = { +static char *fireball_4c[] = { /* width height ncolors chars_per_pixel */ "48 48 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/fireball/fireball_4.xpm xevil-2.02r2/x11/gen_xpm/fireball/fireball_4.xpm --- xevil-2.02r2/x11/gen_xpm/fireball/fireball_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/fireball/fireball_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *fireball_4[] = { +static char *fireball_4[] = { /* width height ncolors chars_per_pixel */ "48 48 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_0b.xpm xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_0b.xpm --- xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_0b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *fire_demon_0b[] = { +static char *fire_demon_0b[] = { /* width height ncolors chars_per_pixel */ "104 88 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_0.xpm xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_0.xpm --- xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_0.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *fire_demon_0[] = { +static char *fire_demon_0[] = { /* width height ncolors chars_per_pixel */ "104 88 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_22.xpm xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_22.xpm --- xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_22.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_22.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *fire_demon_22[] = { +static char *fire_demon_22[] = { /* width height ncolors chars_per_pixel */ "120 96 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_25.xpm xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_25.xpm --- xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_25.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *fire_demon_25[] = { +static char *fire_demon_25[] = { /* width height ncolors chars_per_pixel */ "98 44 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_2.xpm xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_2.xpm --- xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_2.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *fire_demon_2[] = { +static char *fire_demon_2[] = { /* width height ncolors chars_per_pixel */ "92 88 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_4.xpm xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_4.xpm --- xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_4.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *fire_demon_4[] = { +static char *fire_demon_4[] = { /* width height ncolors chars_per_pixel */ "96 96 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_5b.xpm xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_5b.xpm --- xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_5b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_5b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *fire_demon_5b[] = { +static char *fire_demon_5b[] = { /* width height ncolors chars_per_pixel */ "94 96 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_5.xpm xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_5.xpm --- xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/fire_demon/fire_demon_5.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *fire_demon_5[] = { +static char *fire_demon_5[] = { /* width height ncolors chars_per_pixel */ "94 96 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/flag/flag_4.xpm xevil-2.02r2/x11/gen_xpm/flag/flag_4.xpm --- xevil-2.02r2/x11/gen_xpm/flag/flag_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/flag/flag_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *flag_4[] = { +static char *flag_4[] = { /* width height ncolors chars_per_pixel */ "22 26 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/flame_thrower/flame_thrower_4.xpm xevil-2.02r2/x11/gen_xpm/flame_thrower/flame_thrower_4.xpm --- xevil-2.02r2/x11/gen_xpm/flame_thrower/flame_thrower_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/flame_thrower/flame_thrower_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *flame_thrower_4[] = { +static char *flame_thrower_4[] = { /* width height ncolors chars_per_pixel */ "32 18 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/frog/frog_0.xpm xevil-2.02r2/x11/gen_xpm/frog/frog_0.xpm --- xevil-2.02r2/x11/gen_xpm/frog/frog_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/frog/frog_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *frog_0[] = { +static char *frog_0[] = { /* width height ncolors chars_per_pixel */ "14 10 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/frog/frog_24.xpm xevil-2.02r2/x11/gen_xpm/frog/frog_24.xpm --- xevil-2.02r2/x11/gen_xpm/frog/frog_24.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/frog/frog_24.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *frog_24[] = { +static char *frog_24[] = { /* width height ncolors chars_per_pixel */ "26 16 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/frog/frog_25.xpm xevil-2.02r2/x11/gen_xpm/frog/frog_25.xpm --- xevil-2.02r2/x11/gen_xpm/frog/frog_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/frog/frog_25.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *frog_25[] = { +static char *frog_25[] = { /* width height ncolors chars_per_pixel */ "14 14 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/frog/frog_2.xpm xevil-2.02r2/x11/gen_xpm/frog/frog_2.xpm --- xevil-2.02r2/x11/gen_xpm/frog/frog_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/frog/frog_2.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *frog_2[] = { +static char *frog_2[] = { /* width height ncolors chars_per_pixel */ "26 16 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/frog/frog_4.xpm xevil-2.02r2/x11/gen_xpm/frog/frog_4.xpm --- xevil-2.02r2/x11/gen_xpm/frog/frog_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/frog/frog_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *frog_4[] = { +static char *frog_4[] = { /* width height ncolors chars_per_pixel */ "18 22 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/frog/frog_5.xpm xevil-2.02r2/x11/gen_xpm/frog/frog_5.xpm --- xevil-2.02r2/x11/gen_xpm/frog/frog_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/frog/frog_5.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *frog_5[] = { +static char *frog_5[] = { /* width height ncolors chars_per_pixel */ "18 10 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/frog_gun/frog_gun_4.xpm xevil-2.02r2/x11/gen_xpm/frog_gun/frog_gun_4.xpm --- xevil-2.02r2/x11/gen_xpm/frog_gun/frog_gun_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/frog_gun/frog_gun_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *frog_gun_4[] = { +static char *frog_gun_4[] = { /* width height ncolors chars_per_pixel */ "28 16 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/frog_shell/frog_shell_4b.xpm xevil-2.02r2/x11/gen_xpm/frog_shell/frog_shell_4b.xpm --- xevil-2.02r2/x11/gen_xpm/frog_shell/frog_shell_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/frog_shell/frog_shell_4b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *frog_shell_4b[] = { +static char *frog_shell_4b[] = { /* width height ncolors chars_per_pixel */ "10 10 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/frog_shell/frog_shell_4.xpm xevil-2.02r2/x11/gen_xpm/frog_shell/frog_shell_4.xpm --- xevil-2.02r2/x11/gen_xpm/frog_shell/frog_shell_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/frog_shell/frog_shell_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *frog_shell_4[] = { +static char *frog_shell_4[] = { /* width height ncolors chars_per_pixel */ "10 10 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_25.xpm xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_25.xpm --- xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_25.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *green_blood_25[] = { +static char *green_blood_25[] = { /* width height ncolors chars_per_pixel */ "14 4 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_39.xpm xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_39.xpm --- xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_39.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_39.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *green_blood_39[] = { +static char *green_blood_39[] = { /* width height ncolors chars_per_pixel */ "10 10 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_40.xpm xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_40.xpm --- xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_40.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_40.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *green_blood_40[] = { +static char *green_blood_40[] = { /* width height ncolors chars_per_pixel */ "12 8 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_4.xpm xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_4.xpm --- xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *green_blood_4[] = { +static char *green_blood_4[] = { /* width height ncolors chars_per_pixel */ "4 8 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_9.xpm xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_9.xpm --- xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_9.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/green_blood/green_blood_9.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *green_blood_9[] = { +static char *green_blood_9[] = { /* width height ncolors chars_per_pixel */ "14 2 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_0b.xpm xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_0b.xpm --- xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_0b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *green_hugger_0b[] = { +static char *green_hugger_0b[] = { /* width height ncolors chars_per_pixel */ "32 18 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_0.xpm xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_0.xpm --- xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_0.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *green_hugger_0[] = { +static char *green_hugger_0[] = { /* width height ncolors chars_per_pixel */ "32 18 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_25.xpm xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_25.xpm --- xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_25.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *green_hugger_25[] = { +static char *green_hugger_25[] = { /* width height ncolors chars_per_pixel */ "32 14 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_2.xpm xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_2.xpm --- xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_2.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *green_hugger_2[] = { +static char *green_hugger_2[] = { /* width height ncolors chars_per_pixel */ "18 32 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_4b.xpm xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_4b.xpm --- xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_4b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *green_hugger_4b[] = { +static char *green_hugger_4b[] = { /* width height ncolors chars_per_pixel */ "26 32 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_4.xpm xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_4.xpm --- xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_4.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *green_hugger_4[] = { +static char *green_hugger_4[] = { /* width height ncolors chars_per_pixel */ "26 32 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_5.xpm xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_5.xpm --- xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/green_hugger/green_hugger_5.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *green_hugger_5[] = { +static char *green_hugger_5[] = { /* width height ncolors chars_per_pixel */ "20 18 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/grenade/grenade_4b.xpm xevil-2.02r2/x11/gen_xpm/grenade/grenade_4b.xpm --- xevil-2.02r2/x11/gen_xpm/grenade/grenade_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/grenade/grenade_4b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *grenade_4b[] = { +static char *grenade_4b[] = { /* width height ncolors chars_per_pixel */ "16 16 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/grenade/grenade_4c.xpm xevil-2.02r2/x11/gen_xpm/grenade/grenade_4c.xpm --- xevil-2.02r2/x11/gen_xpm/grenade/grenade_4c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/grenade/grenade_4c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *grenade_4c[] = { +static char *grenade_4c[] = { /* width height ncolors chars_per_pixel */ "16 16 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/grenade/grenade_4d.xpm xevil-2.02r2/x11/gen_xpm/grenade/grenade_4d.xpm --- xevil-2.02r2/x11/gen_xpm/grenade/grenade_4d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/grenade/grenade_4d.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *grenade_4d[] = { +static char *grenade_4d[] = { /* width height ncolors chars_per_pixel */ "16 16 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/grenade/grenade_4.xpm xevil-2.02r2/x11/gen_xpm/grenade/grenade_4.xpm --- xevil-2.02r2/x11/gen_xpm/grenade/grenade_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/grenade/grenade_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *grenade_4[] = { +static char *grenade_4[] = { /* width height ncolors chars_per_pixel */ "16 16 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/grenades/grenades_4.xpm xevil-2.02r2/x11/gen_xpm/grenades/grenades_4.xpm --- xevil-2.02r2/x11/gen_xpm/grenades/grenades_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/grenades/grenades_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *grenades_4[] = { +static char *grenades_4[] = { /* width height ncolors chars_per_pixel */ "28 12 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_0b.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_0b.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_0b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_0b[] = { +static char *hero_0b[] = { /* width height ncolors chars_per_pixel */ "32 56 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_0c.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_0c.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_0c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_0c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_0c[] = { +static char *hero_0c[] = { /* width height ncolors chars_per_pixel */ "32 56 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_0d.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_0d.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_0d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_0d.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_0d[] = { +static char *hero_0d[] = { /* width height ncolors chars_per_pixel */ "32 56 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_0e.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_0e.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_0e.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_0e.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_0e[] = { +static char *hero_0e[] = { /* width height ncolors chars_per_pixel */ "32 56 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_0f.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_0f.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_0f.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_0f.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_0f[] = { +static char *hero_0f[] = { /* width height ncolors chars_per_pixel */ "32 56 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_0.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_0.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_0[] = { +static char *hero_0[] = { /* width height ncolors chars_per_pixel */ "32 56 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_10.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_10.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_10.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_10.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_10[] = { +static char *hero_10[] = { /* width height ncolors chars_per_pixel */ "28 42 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_18.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_18.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_18.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_18.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_18[] = { +static char *hero_18[] = { /* width height ncolors chars_per_pixel */ "30 66 17 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_20c.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_20c.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_20c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_20c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_20c[] = { +static char *hero_20c[] = { /* width height ncolors chars_per_pixel */ "30 66 16 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_20d.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_20d.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_20d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_20d.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_20d[] = { +static char *hero_20d[] = { /* width height ncolors chars_per_pixel */ "30 66 18 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_20e.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_20e.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_20e.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_20e.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_20e[] = { +static char *hero_20e[] = { /* width height ncolors chars_per_pixel */ "30 66 16 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_20f.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_20f.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_20f.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_20f.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_20f[] = { +static char *hero_20f[] = { /* width height ncolors chars_per_pixel */ "30 66 18 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_20.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_20.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_20.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_20.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_20[] = { +static char *hero_20[] = { /* width height ncolors chars_per_pixel */ "30 66 19 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_25.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_25.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_25.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_25[] = { +static char *hero_25[] = { /* width height ncolors chars_per_pixel */ "56 12 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_26.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_26.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_26.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_26.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_26[] = { +static char *hero_26[] = { /* width height ncolors chars_per_pixel */ "34 56 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_28.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_28.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_28.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_28.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_28[] = { +static char *hero_28[] = { /* width height ncolors chars_per_pixel */ "62 14 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_2.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_2.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_2.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_2[] = { +static char *hero_2[] = { /* width height ncolors chars_per_pixel */ "30 50 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_32.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_32.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_32.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_32.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_32[] = { +static char *hero_32[] = { /* width height ncolors chars_per_pixel */ "36 46 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_38.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_38.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_38.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_38.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_38[] = { +static char *hero_38[] = { /* width height ncolors chars_per_pixel */ "22 72 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_39.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_39.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_39.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_39.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_39[] = { +static char *hero_39[] = { /* width height ncolors chars_per_pixel */ "14 62 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_4.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_4.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_4[] = { +static char *hero_4[] = { /* width height ncolors chars_per_pixel */ "26 64 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_5.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_5.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_5.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_5[] = { +static char *hero_5[] = { /* width height ncolors chars_per_pixel */ "34 56 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/hero/hero_9.xpm xevil-2.02r2/x11/gen_xpm/hero/hero_9.xpm --- xevil-2.02r2/x11/gen_xpm/hero/hero_9.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/hero/hero_9.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *hero_9[] = { +static char *hero_9[] = { /* width height ncolors chars_per_pixel */ "28 42 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/home/home_4.xpm xevil-2.02r2/x11/gen_xpm/home/home_4.xpm --- xevil-2.02r2/x11/gen_xpm/home/home_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/home/home_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *home_4[] = { +static char *home_4[] = { /* width height ncolors chars_per_pixel */ "48 52 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/lance/lance_25.xpm xevil-2.02r2/x11/gen_xpm/lance/lance_25.xpm --- xevil-2.02r2/x11/gen_xpm/lance/lance_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/lance/lance_25.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *lance_25[] = { +static char *lance_25[] = { /* width height ncolors chars_per_pixel */ "80 2 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/lance/lance_28.xpm xevil-2.02r2/x11/gen_xpm/lance/lance_28.xpm --- xevil-2.02r2/x11/gen_xpm/lance/lance_28.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/lance/lance_28.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *lance_28[] = { +static char *lance_28[] = { /* width height ncolors chars_per_pixel */ "2 80 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/lancer/lancer_4.xpm xevil-2.02r2/x11/gen_xpm/lancer/lancer_4.xpm --- xevil-2.02r2/x11/gen_xpm/lancer/lancer_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/lancer/lancer_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *lancer_4[] = { +static char *lancer_4[] = { /* width height ncolors chars_per_pixel */ "40 12 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/laser/laser_25.xpm xevil-2.02r2/x11/gen_xpm/laser/laser_25.xpm --- xevil-2.02r2/x11/gen_xpm/laser/laser_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/laser/laser_25.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *laser_25[] = { +static char *laser_25[] = { /* width height ncolors chars_per_pixel */ "60 2 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/laser/laser_28.xpm xevil-2.02r2/x11/gen_xpm/laser/laser_28.xpm --- xevil-2.02r2/x11/gen_xpm/laser/laser_28.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/laser/laser_28.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *laser_28[] = { +static char *laser_28[] = { /* width height ncolors chars_per_pixel */ "2 60 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/launcher/launcher_4.xpm xevil-2.02r2/x11/gen_xpm/launcher/launcher_4.xpm --- xevil-2.02r2/x11/gen_xpm/launcher/launcher_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/launcher/launcher_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *launcher_4[] = { +static char *launcher_4[] = { /* width height ncolors chars_per_pixel */ "42 24 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/locator/tick_0_0.xpm xevil-2.02r2/x11/gen_xpm/locator/tick_0_0.xpm --- xevil-2.02r2/x11/gen_xpm/locator/tick_0_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/locator/tick_0_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *tick_0_0[] = { +static char *tick_0_0[] = { /* width height ncolors chars_per_pixel */ "16 14 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/locator/tick_0_7.xpm xevil-2.02r2/x11/gen_xpm/locator/tick_0_7.xpm --- xevil-2.02r2/x11/gen_xpm/locator/tick_0_7.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/locator/tick_0_7.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *tick_0_7[] = { +static char *tick_0_7[] = { /* width height ncolors chars_per_pixel */ "16 16 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/locator/tick_1_0.xpm xevil-2.02r2/x11/gen_xpm/locator/tick_1_0.xpm --- xevil-2.02r2/x11/gen_xpm/locator/tick_1_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/locator/tick_1_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *tick_1_0[] = { +static char *tick_1_0[] = { /* width height ncolors chars_per_pixel */ "16 14 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/locator/tick_1_7.xpm xevil-2.02r2/x11/gen_xpm/locator/tick_1_7.xpm --- xevil-2.02r2/x11/gen_xpm/locator/tick_1_7.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/locator/tick_1_7.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *tick_1_7[] = { +static char *tick_1_7[] = { /* width height ncolors chars_per_pixel */ "16 16 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/locator/tick_2_0.xpm xevil-2.02r2/x11/gen_xpm/locator/tick_2_0.xpm --- xevil-2.02r2/x11/gen_xpm/locator/tick_2_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/locator/tick_2_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *tick_2_0[] = { +static char *tick_2_0[] = { /* width height ncolors chars_per_pixel */ "16 14 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/locator/tick_2_7.xpm xevil-2.02r2/x11/gen_xpm/locator/tick_2_7.xpm --- xevil-2.02r2/x11/gen_xpm/locator/tick_2_7.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/locator/tick_2_7.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *tick_2_7[] = { +static char *tick_2_7[] = { /* width height ncolors chars_per_pixel */ "16 16 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/locator/tick_3_0.xpm xevil-2.02r2/x11/gen_xpm/locator/tick_3_0.xpm --- xevil-2.02r2/x11/gen_xpm/locator/tick_3_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/locator/tick_3_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *tick_3_0[] = { +static char *tick_3_0[] = { /* width height ncolors chars_per_pixel */ "16 14 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/locator/tick_3_7.xpm xevil-2.02r2/x11/gen_xpm/locator/tick_3_7.xpm --- xevil-2.02r2/x11/gen_xpm/locator/tick_3_7.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/locator/tick_3_7.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *tick_3_7[] = { +static char *tick_3_7[] = { /* width height ncolors chars_per_pixel */ "16 16 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/machine_gun/machine_gun_4.xpm xevil-2.02r2/x11/gen_xpm/machine_gun/machine_gun_4.xpm --- xevil-2.02r2/x11/gen_xpm/machine_gun/machine_gun_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/machine_gun/machine_gun_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *machine_gun_4[] = { +static char *machine_gun_4[] = { /* width height ncolors chars_per_pixel */ "34 18 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/med_kit/med_kit_4.xpm xevil-2.02r2/x11/gen_xpm/med_kit/med_kit_4.xpm --- xevil-2.02r2/x11/gen_xpm/med_kit/med_kit_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/med_kit/med_kit_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *med_kit_4[] = { +static char *med_kit_4[] = { /* width height ncolors chars_per_pixel */ "14 14 21 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/missile/missile_25.xpm xevil-2.02r2/x11/gen_xpm/missile/missile_25.xpm --- xevil-2.02r2/x11/gen_xpm/missile/missile_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/missile/missile_25.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *missile_25[] = { +static char *missile_25[] = { /* width height ncolors chars_per_pixel */ "20 6 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/missile/missile_39.xpm xevil-2.02r2/x11/gen_xpm/missile/missile_39.xpm --- xevil-2.02r2/x11/gen_xpm/missile/missile_39.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/missile/missile_39.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *missile_39[] = { +static char *missile_39[] = { /* width height ncolors chars_per_pixel */ "14 14 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/missile/missile_40.xpm xevil-2.02r2/x11/gen_xpm/missile/missile_40.xpm --- xevil-2.02r2/x11/gen_xpm/missile/missile_40.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/missile/missile_40.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *missile_40[] = { +static char *missile_40[] = { /* width height ncolors chars_per_pixel */ "18 12 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_0b.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_0b.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_0b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_0b[] = { +static char *mutt_0b[] = { /* width height ncolors chars_per_pixel */ "24 20 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_0.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_0.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_0.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_0[] = { +static char *mutt_0[] = { /* width height ncolors chars_per_pixel */ "24 20 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_19b.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_19b.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_19b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_19b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_19b[] = { +static char *mutt_19b[] = { /* width height ncolors chars_per_pixel */ "20 24 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_19.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_19.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_19.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_19.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_19[] = { +static char *mutt_19[] = { /* width height ncolors chars_per_pixel */ "20 24 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_20b.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_20b.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_20b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_20b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_20b[] = { +static char *mutt_20b[] = { /* width height ncolors chars_per_pixel */ "20 24 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_25.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_25.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_25.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_25[] = { +static char *mutt_25[] = { /* width height ncolors chars_per_pixel */ "24 14 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_26.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_26.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_26.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_26.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_26[] = { +static char *mutt_26[] = { /* width height ncolors chars_per_pixel */ "24 20 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_28.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_28.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_28.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_28.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_28[] = { +static char *mutt_28[] = { /* width height ncolors chars_per_pixel */ "24 18 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_2.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_2.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_2.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_2[] = { +static char *mutt_2[] = { /* width height ncolors chars_per_pixel */ "24 18 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_38.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_38.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_38.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_38.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_38[] = { +static char *mutt_38[] = { /* width height ncolors chars_per_pixel */ "18 24 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_39.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_39.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_39.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_39.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_39[] = { +static char *mutt_39[] = { /* width height ncolors chars_per_pixel */ "18 24 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_4.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_4.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_4.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_4[] = { +static char *mutt_4[] = { /* width height ncolors chars_per_pixel */ "20 24 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_5b.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_5b.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_5b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_5b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_5b[] = { +static char *mutt_5b[] = { /* width height ncolors chars_per_pixel */ "10 20 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/mutt/mutt_5.xpm xevil-2.02r2/x11/gen_xpm/mutt/mutt_5.xpm --- xevil-2.02r2/x11/gen_xpm/mutt/mutt_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/mutt/mutt_5.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mutt_5[] = { +static char *mutt_5[] = { /* width height ncolors chars_per_pixel */ "10 20 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4b.xpm xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4b.xpm --- xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *napalm_grenade_4b[] = { +static char *napalm_grenade_4b[] = { /* width height ncolors chars_per_pixel */ "16 16 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4c.xpm xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4c.xpm --- xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *napalm_grenade_4c[] = { +static char *napalm_grenade_4c[] = { /* width height ncolors chars_per_pixel */ "16 16 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4d.xpm xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4d.xpm --- xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4d.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *napalm_grenade_4d[] = { +static char *napalm_grenade_4d[] = { /* width height ncolors chars_per_pixel */ "16 16 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4.xpm xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4.xpm --- xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/napalm_grenade/napalm_grenade_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *napalm_grenade_4[] = { +static char *napalm_grenade_4[] = { /* width height ncolors chars_per_pixel */ "16 16 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/napalm_grenades/napalm_grenades_4.xpm xevil-2.02r2/x11/gen_xpm/napalm_grenades/napalm_grenades_4.xpm --- xevil-2.02r2/x11/gen_xpm/napalm_grenades/napalm_grenades_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/napalm_grenades/napalm_grenades_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *napalm_grenades_4[] = { +static char *napalm_grenades_4[] = { /* width height ncolors chars_per_pixel */ "28 12 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_0b.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_0b.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_0b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_0b[] = { +static char *ninja_0b[] = { /* width height ncolors chars_per_pixel */ "32 56 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_0c.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_0c.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_0c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_0c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_0c[] = { +static char *ninja_0c[] = { /* width height ncolors chars_per_pixel */ "32 56 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_0d.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_0d.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_0d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_0d.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_0d[] = { +static char *ninja_0d[] = { /* width height ncolors chars_per_pixel */ "32 56 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_0e.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_0e.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_0e.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_0e.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_0e[] = { +static char *ninja_0e[] = { /* width height ncolors chars_per_pixel */ "32 56 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_0f.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_0f.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_0f.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_0f.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_0f[] = { +static char *ninja_0f[] = { /* width height ncolors chars_per_pixel */ "32 56 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_0.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_0.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_0[] = { +static char *ninja_0[] = { /* width height ncolors chars_per_pixel */ "32 56 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_10b.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_10b.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_10b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_10b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_10b[] = { +static char *ninja_10b[] = { /* width height ncolors chars_per_pixel */ "62 22 18 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_10c.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_10c.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_10c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_10c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_10c[] = { +static char *ninja_10c[] = { /* width height ncolors chars_per_pixel */ "62 22 18 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_10d.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_10d.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_10d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_10d.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_10d[] = { +static char *ninja_10d[] = { /* width height ncolors chars_per_pixel */ "62 22 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_10e.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_10e.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_10e.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_10e.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_10e[] = { +static char *ninja_10e[] = { /* width height ncolors chars_per_pixel */ "62 22 16 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_10f.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_10f.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_10f.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_10f.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_10f[] = { +static char *ninja_10f[] = { /* width height ncolors chars_per_pixel */ "62 22 19 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_18.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_18.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_18.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_18.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_18[] = { +static char *ninja_18[] = { /* width height ncolors chars_per_pixel */ "28 64 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_20c.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_20c.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_20c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_20c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_20c[] = { +static char *ninja_20c[] = { /* width height ncolors chars_per_pixel */ "28 64 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_20d.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_20d.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_20d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_20d.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_20d[] = { +static char *ninja_20d[] = { /* width height ncolors chars_per_pixel */ "28 64 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_20e.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_20e.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_20e.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_20e.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_20e[] = { +static char *ninja_20e[] = { /* width height ncolors chars_per_pixel */ "28 64 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_20f.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_20f.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_20f.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_20f.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_20f[] = { +static char *ninja_20f[] = { /* width height ncolors chars_per_pixel */ "28 64 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_20.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_20.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_20.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_20.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_20[] = { +static char *ninja_20[] = { /* width height ncolors chars_per_pixel */ "28 64 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_22b.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_22b.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_22b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_22b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_22b[] = { +static char *ninja_22b[] = { /* width height ncolors chars_per_pixel */ "28 60 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_22.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_22.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_22.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_22.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_22[] = { +static char *ninja_22[] = { /* width height ncolors chars_per_pixel */ "28 60 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_25.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_25.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_25.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_25[] = { +static char *ninja_25[] = { /* width height ncolors chars_per_pixel */ "44 12 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_26.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_26.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_26.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_26.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_26[] = { +static char *ninja_26[] = { /* width height ncolors chars_per_pixel */ "48 48 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_28.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_28.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_28.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_28.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_28[] = { +static char *ninja_28[] = { /* width height ncolors chars_per_pixel */ "48 38 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_2b.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_2b.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_2b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_2b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_2b[] = { +static char *ninja_2b[] = { /* width height ncolors chars_per_pixel */ "36 36 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_2c.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_2c.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_2c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_2c.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_2c[] = { +static char *ninja_2c[] = { /* width height ncolors chars_per_pixel */ "36 36 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_2d.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_2d.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_2d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_2d.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_2d[] = { +static char *ninja_2d[] = { /* width height ncolors chars_per_pixel */ "36 36 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_2.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_2.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_2.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_2[] = { +static char *ninja_2[] = { /* width height ncolors chars_per_pixel */ "36 36 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_32.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_32.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_32.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_32.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_32[] = { +static char *ninja_32[] = { /* width height ncolors chars_per_pixel */ "62 22 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_38.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_38.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_38.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_38.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_38[] = { +static char *ninja_38[] = { /* width height ncolors chars_per_pixel */ "24 72 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_39.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_39.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_39.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_39.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_39[] = { +static char *ninja_39[] = { /* width height ncolors chars_per_pixel */ "28 60 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_4.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_4.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_4[] = { +static char *ninja_4[] = { /* width height ncolors chars_per_pixel */ "28 60 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_5.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_5.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_5.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_5[] = { +static char *ninja_5[] = { /* width height ncolors chars_per_pixel */ "28 56 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/ninja/ninja_9.xpm xevil-2.02r2/x11/gen_xpm/ninja/ninja_9.xpm --- xevil-2.02r2/x11/gen_xpm/ninja/ninja_9.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/ninja/ninja_9.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *ninja_9[] = { +static char *ninja_9[] = { /* width height ncolors chars_per_pixel */ "62 22 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/n_shield/n_shield_4.xpm xevil-2.02r2/x11/gen_xpm/n_shield/n_shield_4.xpm --- xevil-2.02r2/x11/gen_xpm/n_shield/n_shield_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/n_shield/n_shield_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *n_shield_4[] = { +static char *n_shield_4[] = { /* width height ncolors chars_per_pixel */ "14 18 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_25.xpm xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_25.xpm --- xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_25.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *oil_droplet_25[] = { +static char *oil_droplet_25[] = { /* width height ncolors chars_per_pixel */ "14 4 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_39.xpm xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_39.xpm --- xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_39.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_39.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *oil_droplet_39[] = { +static char *oil_droplet_39[] = { /* width height ncolors chars_per_pixel */ "10 10 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_40.xpm xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_40.xpm --- xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_40.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_40.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *oil_droplet_40[] = { +static char *oil_droplet_40[] = { /* width height ncolors chars_per_pixel */ "12 8 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_4.xpm xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_4.xpm --- xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *oil_droplet_4[] = { +static char *oil_droplet_4[] = { /* width height ncolors chars_per_pixel */ "4 8 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_9.xpm xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_9.xpm --- xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_9.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/oil_droplet/oil_droplet_9.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *oil_droplet_9[] = { +static char *oil_droplet_9[] = { /* width height ncolors chars_per_pixel */ "14 2 2 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/PCP/PCP_4.xpm xevil-2.02r2/x11/gen_xpm/PCP/PCP_4.xpm --- xevil-2.02r2/x11/gen_xpm/PCP/PCP_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/PCP/PCP_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *PCP_4[] = { +static char *PCP_4[] = { /* width height ncolors chars_per_pixel */ "24 12 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/pistol/pistol_4.xpm xevil-2.02r2/x11/gen_xpm/pistol/pistol_4.xpm --- xevil-2.02r2/x11/gen_xpm/pistol/pistol_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/pistol/pistol_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *pistol_4[] = { +static char *pistol_4[] = { /* width height ncolors chars_per_pixel */ "20 18 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_0b.xpm xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_0b.xpm --- xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_0b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *red_hugger_0b[] = { +static char *red_hugger_0b[] = { /* width height ncolors chars_per_pixel */ "32 18 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_0.xpm xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_0.xpm --- xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_0.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *red_hugger_0[] = { +static char *red_hugger_0[] = { /* width height ncolors chars_per_pixel */ "32 18 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_25.xpm xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_25.xpm --- xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_25.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *red_hugger_25[] = { +static char *red_hugger_25[] = { /* width height ncolors chars_per_pixel */ "32 14 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_2.xpm xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_2.xpm --- xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_2.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *red_hugger_2[] = { +static char *red_hugger_2[] = { /* width height ncolors chars_per_pixel */ "18 32 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_4b.xpm xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_4b.xpm --- xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_4b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *red_hugger_4b[] = { +static char *red_hugger_4b[] = { /* width height ncolors chars_per_pixel */ "26 32 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_4.xpm xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_4.xpm --- xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_4.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *red_hugger_4[] = { +static char *red_hugger_4[] = { /* width height ncolors chars_per_pixel */ "26 32 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_5.xpm xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_5.xpm --- xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/red_hugger/red_hugger_5.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *red_hugger_5[] = { +static char *red_hugger_5[] = { /* width height ncolors chars_per_pixel */ "20 18 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/rock/rock_4.xpm xevil-2.02r2/x11/gen_xpm/rock/rock_4.xpm --- xevil-2.02r2/x11/gen_xpm/rock/rock_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/rock/rock_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *rock_4[] = { +static char *rock_4[] = { /* width height ncolors chars_per_pixel */ "26 26 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/shell/shell_4.xpm xevil-2.02r2/x11/gen_xpm/shell/shell_4.xpm --- xevil-2.02r2/x11/gen_xpm/shell/shell_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/shell/shell_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *shell_4[] = { +static char *shell_4[] = { /* width height ncolors chars_per_pixel */ "12 12 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/soul_swapper/soul_swapper_4.xpm xevil-2.02r2/x11/gen_xpm/soul_swapper/soul_swapper_4.xpm --- xevil-2.02r2/x11/gen_xpm/soul_swapper/soul_swapper_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/soul_swapper/soul_swapper_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *soul_swapper_4[] = { +static char *soul_swapper_4[] = { /* width height ncolors chars_per_pixel */ "30 14 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/star/star_4b.xpm xevil-2.02r2/x11/gen_xpm/star/star_4b.xpm --- xevil-2.02r2/x11/gen_xpm/star/star_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/star/star_4b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *star_4b[] = { +static char *star_4b[] = { /* width height ncolors chars_per_pixel */ "14 14 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/star/star_4.xpm xevil-2.02r2/x11/gen_xpm/star/star_4.xpm --- xevil-2.02r2/x11/gen_xpm/star/star_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/star/star_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *star_4[] = { +static char *star_4[] = { /* width height ncolors chars_per_pixel */ "14 14 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/stars/stars_4.xpm xevil-2.02r2/x11/gen_xpm/stars/stars_4.xpm --- xevil-2.02r2/x11/gen_xpm/stars/stars_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/stars/stars_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *stars_4[] = { +static char *stars_4[] = { /* width height ncolors chars_per_pixel */ "36 24 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/swap_shell/swap_shell_4b.xpm xevil-2.02r2/x11/gen_xpm/swap_shell/swap_shell_4b.xpm --- xevil-2.02r2/x11/gen_xpm/swap_shell/swap_shell_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/swap_shell/swap_shell_4b.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *swap_shell_4b[] = { +static char *swap_shell_4b[] = { /* width height ncolors chars_per_pixel */ "10 10 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/swap_shell/swap_shell_4.xpm xevil-2.02r2/x11/gen_xpm/swap_shell/swap_shell_4.xpm --- xevil-2.02r2/x11/gen_xpm/swap_shell/swap_shell_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/swap_shell/swap_shell_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *swap_shell_4[] = { +static char *swap_shell_4[] = { /* width height ncolors chars_per_pixel */ "10 10 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/transmogifier/transmogifier_4.xpm xevil-2.02r2/x11/gen_xpm/transmogifier/transmogifier_4.xpm --- xevil-2.02r2/x11/gen_xpm/transmogifier/transmogifier_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/transmogifier/transmogifier_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *transmogifier_4[] = { +static char *transmogifier_4[] = { /* width height ncolors chars_per_pixel */ "52 30 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/trapdoor/trapdoor_4.xpm xevil-2.02r2/x11/gen_xpm/trapdoor/trapdoor_4.xpm --- xevil-2.02r2/x11/gen_xpm/trapdoor/trapdoor_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/trapdoor/trapdoor_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *trapdoor_4[] = { +static char *trapdoor_4[] = { /* width height ncolors chars_per_pixel */ "60 30 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/t_shield/t_shield_4.xpm xevil-2.02r2/x11/gen_xpm/t_shield/t_shield_4.xpm --- xevil-2.02r2/x11/gen_xpm/t_shield/t_shield_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/t_shield/t_shield_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *t_shield_4[] = { +static char *t_shield_4[] = { /* width height ncolors chars_per_pixel */ "14 18 21 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_0b.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_0b.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_0b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_0b[] = { +static char *walker_0b[] = { /* width height ncolors chars_per_pixel */ "56 52 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_0c.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_0c.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_0c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_0c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_0c[] = { +static char *walker_0c[] = { /* width height ncolors chars_per_pixel */ "56 52 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_0d.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_0d.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_0d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_0d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_0d[] = { +static char *walker_0d[] = { /* width height ncolors chars_per_pixel */ "56 52 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_0.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_0.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_0.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_0[] = { +static char *walker_0[] = { /* width height ncolors chars_per_pixel */ "56 52 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_18.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_18.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_18.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_18.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_18[] = { +static char *walker_18[] = { /* width height ncolors chars_per_pixel */ "32 52 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_20b.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_20b.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_20b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_20b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_20b[] = { +static char *walker_20b[] = { /* width height ncolors chars_per_pixel */ "32 52 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_25.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_25.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_25.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_25[] = { +static char *walker_25[] = { /* width height ncolors chars_per_pixel */ "54 28 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_2b.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_2b.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_2b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_2b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_2b[] = { +static char *walker_2b[] = { /* width height ncolors chars_per_pixel */ "74 30 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_2.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_2.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_2.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_2[] = { +static char *walker_2[] = { /* width height ncolors chars_per_pixel */ "74 30 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_4b.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_4b.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_4b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_4b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_4b[] = { +static char *walker_4b[] = { /* width height ncolors chars_per_pixel */ "40 26 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_4c.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_4c.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_4c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_4c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_4c[] = { +static char *walker_4c[] = { /* width height ncolors chars_per_pixel */ "40 26 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_4d.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_4d.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_4d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_4d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_4d[] = { +static char *walker_4d[] = { /* width height ncolors chars_per_pixel */ "40 26 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_4.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_4.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_4.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_4[] = { +static char *walker_4[] = { /* width height ncolors chars_per_pixel */ "40 26 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_5b.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_5b.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_5b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_5b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_5b[] = { +static char *walker_5b[] = { /* width height ncolors chars_per_pixel */ "40 52 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_5c.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_5c.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_5c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_5c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_5c[] = { +static char *walker_5c[] = { /* width height ncolors chars_per_pixel */ "40 52 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_5d.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_5d.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_5d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_5d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_5d[] = { +static char *walker_5d[] = { /* width height ncolors chars_per_pixel */ "40 52 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/walker/walker_5.xpm xevil-2.02r2/x11/gen_xpm/walker/walker_5.xpm --- xevil-2.02r2/x11/gen_xpm/walker/walker_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/walker/walker_5.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *walker_5[] = { +static char *walker_5[] = { /* width height ncolors chars_per_pixel */ "40 52 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/weight/weight_4.xpm xevil-2.02r2/x11/gen_xpm/weight/weight_4.xpm --- xevil-2.02r2/x11/gen_xpm/weight/weight_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/weight/weight_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *weight_4[] = { +static char *weight_4[] = { /* width height ncolors chars_per_pixel */ "28 30 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_0.xpm xevil-2.02r2/x11/gen_xpm/world/background_0.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_0.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_0[] = { +static char *background_0[] = { /* width height ncolors chars_per_pixel */ "100 100 27 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_10.xpm xevil-2.02r2/x11/gen_xpm/world/background_10.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_10.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_10.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_10[] = { +static char *background_10[] = { /* width height ncolors chars_per_pixel */ "128 128 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_11.xpm xevil-2.02r2/x11/gen_xpm/world/background_11.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_11.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_11.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_11[] = { +static char *background_11[] = { /* width height ncolors chars_per_pixel */ "128 128 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_12.xpm xevil-2.02r2/x11/gen_xpm/world/background_12.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_12.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_12.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_12[] = { +static char *background_12[] = { /* width height ncolors chars_per_pixel */ "128 128 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_13.xpm xevil-2.02r2/x11/gen_xpm/world/background_13.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_13.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_13.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_13[] = { +static char *background_13[] = { /* width height ncolors chars_per_pixel */ "128 128 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_1.xpm xevil-2.02r2/x11/gen_xpm/world/background_1.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_1.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_1.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_1[] = { +static char *background_1[] = { /* width height ncolors chars_per_pixel */ "100 100 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_2.xpm xevil-2.02r2/x11/gen_xpm/world/background_2.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_2.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_2[] = { +static char *background_2[] = { /* width height ncolors chars_per_pixel */ "100 100 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_3.xpm xevil-2.02r2/x11/gen_xpm/world/background_3.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_3.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_3.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_3[] = { +static char *background_3[] = { /* width height ncolors chars_per_pixel */ "100 100 27 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_4.xpm xevil-2.02r2/x11/gen_xpm/world/background_4.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_4[] = { +static char *background_4[] = { /* width height ncolors chars_per_pixel */ "100 100 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_5.xpm xevil-2.02r2/x11/gen_xpm/world/background_5.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_5.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_5[] = { +static char *background_5[] = { /* width height ncolors chars_per_pixel */ "100 100 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_6.xpm xevil-2.02r2/x11/gen_xpm/world/background_6.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_6.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_6.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_6[] = { +static char *background_6[] = { /* width height ncolors chars_per_pixel */ "64 64 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_7.xpm xevil-2.02r2/x11/gen_xpm/world/background_7.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_7.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_7.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_7[] = { +static char *background_7[] = { /* width height ncolors chars_per_pixel */ "94 94 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_8.xpm xevil-2.02r2/x11/gen_xpm/world/background_8.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_8.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_8.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_8[] = { +static char *background_8[] = { /* width height ncolors chars_per_pixel */ "128 128 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/background_9.xpm xevil-2.02r2/x11/gen_xpm/world/background_9.xpm --- xevil-2.02r2/x11/gen_xpm/world/background_9.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/background_9.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *background_9[] = { +static char *background_9[] = { /* width height ncolors chars_per_pixel */ "128 128 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_0.xpm xevil-2.02r2/x11/gen_xpm/world/block_0.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_0.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_0[] = { +static char *block_0[] = { /* width height ncolors chars_per_pixel */ "32 32 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_10.xpm xevil-2.02r2/x11/gen_xpm/world/block_10.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_10.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_10.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_10[] = { +static char *block_10[] = { /* width height ncolors chars_per_pixel */ "32 32 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_11.xpm xevil-2.02r2/x11/gen_xpm/world/block_11.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_11.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_11.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_11[] = { +static char *block_11[] = { /* width height ncolors chars_per_pixel */ "32 32 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_12.xpm xevil-2.02r2/x11/gen_xpm/world/block_12.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_12.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_12.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_12[] = { +static char *block_12[] = { /* width height ncolors chars_per_pixel */ "32 32 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_13.xpm xevil-2.02r2/x11/gen_xpm/world/block_13.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_13.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_13.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_13[] = { +static char *block_13[] = { /* width height ncolors chars_per_pixel */ "32 32 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_14.xpm xevil-2.02r2/x11/gen_xpm/world/block_14.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_14.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_14.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_14[] = { +static char *block_14[] = { /* width height ncolors chars_per_pixel */ "32 32 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_15.xpm xevil-2.02r2/x11/gen_xpm/world/block_15.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_15.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_15.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_15[] = { +static char *block_15[] = { /* width height ncolors chars_per_pixel */ "32 32 18 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_16.xpm xevil-2.02r2/x11/gen_xpm/world/block_16.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_16.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_16.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_16[] = { +static char *block_16[] = { /* width height ncolors chars_per_pixel */ "32 32 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_17.xpm xevil-2.02r2/x11/gen_xpm/world/block_17.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_17.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_17.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_17[] = { +static char *block_17[] = { /* width height ncolors chars_per_pixel */ "32 32 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_18.xpm xevil-2.02r2/x11/gen_xpm/world/block_18.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_18.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_18.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_18[] = { +static char *block_18[] = { /* width height ncolors chars_per_pixel */ "32 32 16 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_19.xpm xevil-2.02r2/x11/gen_xpm/world/block_19.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_19.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_19.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_19[] = { +static char *block_19[] = { /* width height ncolors chars_per_pixel */ "32 32 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_1.xpm xevil-2.02r2/x11/gen_xpm/world/block_1.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_1.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_1.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_1[] = { +static char *block_1[] = { /* width height ncolors chars_per_pixel */ "32 32 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_20.xpm xevil-2.02r2/x11/gen_xpm/world/block_20.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_20.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_20.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_20[] = { +static char *block_20[] = { /* width height ncolors chars_per_pixel */ "32 32 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_21.xpm xevil-2.02r2/x11/gen_xpm/world/block_21.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_21.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_21.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_21[] = { +static char *block_21[] = { /* width height ncolors chars_per_pixel */ "32 32 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_2.xpm xevil-2.02r2/x11/gen_xpm/world/block_2.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_2.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_2[] = { +static char *block_2[] = { /* width height ncolors chars_per_pixel */ "32 32 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_3.xpm xevil-2.02r2/x11/gen_xpm/world/block_3.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_3.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_3.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_3[] = { +static char *block_3[] = { /* width height ncolors chars_per_pixel */ "32 32 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_4.xpm xevil-2.02r2/x11/gen_xpm/world/block_4.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_4.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_4[] = { +static char *block_4[] = { /* width height ncolors chars_per_pixel */ "32 32 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_5.xpm xevil-2.02r2/x11/gen_xpm/world/block_5.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_5.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_5[] = { +static char *block_5[] = { /* width height ncolors chars_per_pixel */ "32 32 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_6.xpm xevil-2.02r2/x11/gen_xpm/world/block_6.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_6.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_6.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_6[] = { +static char *block_6[] = { /* width height ncolors chars_per_pixel */ "32 32 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_7.xpm xevil-2.02r2/x11/gen_xpm/world/block_7.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_7.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_7.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_7[] = { +static char *block_7[] = { /* width height ncolors chars_per_pixel */ "32 32 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_8.xpm xevil-2.02r2/x11/gen_xpm/world/block_8.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_8.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_8.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_8[] = { +static char *block_8[] = { /* width height ncolors chars_per_pixel */ "32 32 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/block_9.xpm xevil-2.02r2/x11/gen_xpm/world/block_9.xpm --- xevil-2.02r2/x11/gen_xpm/world/block_9.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/block_9.xpm 2000-01-20 05:05:06.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *block_9[] = { +static char *block_9[] = { /* width height ncolors chars_per_pixel */ "32 32 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/door_0.xpm xevil-2.02r2/x11/gen_xpm/world/door_0.xpm --- xevil-2.02r2/x11/gen_xpm/world/door_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/door_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *door_0[] = { +static char *door_0[] = { /* width height ncolors chars_per_pixel */ "32 32 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/door_1.xpm xevil-2.02r2/x11/gen_xpm/world/door_1.xpm --- xevil-2.02r2/x11/gen_xpm/world/door_1.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/door_1.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *door_1[] = { +static char *door_1[] = { /* width height ncolors chars_per_pixel */ "32 32 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/door_2.xpm xevil-2.02r2/x11/gen_xpm/world/door_2.xpm --- xevil-2.02r2/x11/gen_xpm/world/door_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/door_2.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *door_2[] = { +static char *door_2[] = { /* width height ncolors chars_per_pixel */ "32 32 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/door_3.xpm xevil-2.02r2/x11/gen_xpm/world/door_3.xpm --- xevil-2.02r2/x11/gen_xpm/world/door_3.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/door_3.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *door_3[] = { +static char *door_3[] = { /* width height ncolors chars_per_pixel */ "32 32 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/door_4.xpm xevil-2.02r2/x11/gen_xpm/world/door_4.xpm --- xevil-2.02r2/x11/gen_xpm/world/door_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/door_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *door_4[] = { +static char *door_4[] = { /* width height ncolors chars_per_pixel */ "32 32 15 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/door_5.xpm xevil-2.02r2/x11/gen_xpm/world/door_5.xpm --- xevil-2.02r2/x11/gen_xpm/world/door_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/door_5.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *door_5[] = { +static char *door_5[] = { /* width height ncolors chars_per_pixel */ "32 32 14 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/door_6.xpm xevil-2.02r2/x11/gen_xpm/world/door_6.xpm --- xevil-2.02r2/x11/gen_xpm/world/door_6.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/door_6.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *door_6[] = { +static char *door_6[] = { /* width height ncolors chars_per_pixel */ "32 32 16 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/door_7.xpm xevil-2.02r2/x11/gen_xpm/world/door_7.xpm --- xevil-2.02r2/x11/gen_xpm/world/door_7.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/door_7.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *door_7[] = { +static char *door_7[] = { /* width height ncolors chars_per_pixel */ "32 32 17 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/door_8.xpm xevil-2.02r2/x11/gen_xpm/world/door_8.xpm --- xevil-2.02r2/x11/gen_xpm/world/door_8.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/door_8.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *door_8[] = { +static char *door_8[] = { /* width height ncolors chars_per_pixel */ "32 32 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/door_9.xpm xevil-2.02r2/x11/gen_xpm/world/door_9.xpm --- xevil-2.02r2/x11/gen_xpm/world/door_9.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/door_9.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *door_9[] = { +static char *door_9[] = { /* width height ncolors chars_per_pixel */ "32 32 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_0.xpm xevil-2.02r2/x11/gen_xpm/world/mover_0.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_0[] = { +static char *mover_0[] = { /* width height ncolors chars_per_pixel */ "64 32 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_1.xpm xevil-2.02r2/x11/gen_xpm/world/mover_1.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_1.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_1.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_1[] = { +static char *mover_1[] = { /* width height ncolors chars_per_pixel */ "64 32 14 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_2.xpm xevil-2.02r2/x11/gen_xpm/world/mover_2.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_2.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_2[] = { +static char *mover_2[] = { /* width height ncolors chars_per_pixel */ "64 32 16 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_3.xpm xevil-2.02r2/x11/gen_xpm/world/mover_3.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_3.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_3.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_3[] = { +static char *mover_3[] = { /* width height ncolors chars_per_pixel */ "64 32 25 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_4.xpm xevil-2.02r2/x11/gen_xpm/world/mover_4.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_4[] = { +static char *mover_4[] = { /* width height ncolors chars_per_pixel */ "64 32 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_square_0.xpm xevil-2.02r2/x11/gen_xpm/world/mover_square_0.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_square_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_square_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_square_0[] = { +static char *mover_square_0[] = { /* width height ncolors chars_per_pixel */ "32 32 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_square_1.xpm xevil-2.02r2/x11/gen_xpm/world/mover_square_1.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_square_1.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_square_1.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_square_1[] = { +static char *mover_square_1[] = { /* width height ncolors chars_per_pixel */ "32 32 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_square_2.xpm xevil-2.02r2/x11/gen_xpm/world/mover_square_2.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_square_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_square_2.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_square_2[] = { +static char *mover_square_2[] = { /* width height ncolors chars_per_pixel */ "32 32 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_square_3.xpm xevil-2.02r2/x11/gen_xpm/world/mover_square_3.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_square_3.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_square_3.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_square_3[] = { +static char *mover_square_3[] = { /* width height ncolors chars_per_pixel */ "32 32 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_square_4.xpm xevil-2.02r2/x11/gen_xpm/world/mover_square_4.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_square_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_square_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_square_4[] = { +static char *mover_square_4[] = { /* width height ncolors chars_per_pixel */ "32 32 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_square_5.xpm xevil-2.02r2/x11/gen_xpm/world/mover_square_5.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_square_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_square_5.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_square_5[] = { +static char *mover_square_5[] = { /* width height ncolors chars_per_pixel */ "32 32 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_square_6.xpm xevil-2.02r2/x11/gen_xpm/world/mover_square_6.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_square_6.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_square_6.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_square_6[] = { +static char *mover_square_6[] = { /* width height ncolors chars_per_pixel */ "32 32 11 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_square_7.xpm xevil-2.02r2/x11/gen_xpm/world/mover_square_7.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_square_7.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_square_7.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_square_7[] = { +static char *mover_square_7[] = { /* width height ncolors chars_per_pixel */ "32 32 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_square_8.xpm xevil-2.02r2/x11/gen_xpm/world/mover_square_8.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_square_8.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_square_8.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_square_8[] = { +static char *mover_square_8[] = { /* width height ncolors chars_per_pixel */ "32 32 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/mover_square_9.xpm xevil-2.02r2/x11/gen_xpm/world/mover_square_9.xpm --- xevil-2.02r2/x11/gen_xpm/world/mover_square_9.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/mover_square_9.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *mover_square_9[] = { +static char *mover_square_9[] = { /* width height ncolors chars_per_pixel */ "32 32 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/outside_0.xpm xevil-2.02r2/x11/gen_xpm/world/outside_0.xpm --- xevil-2.02r2/x11/gen_xpm/world/outside_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/outside_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *outside_0[] = { +static char *outside_0[] = { /* width height ncolors chars_per_pixel */ "100 100 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/outside_1.xpm xevil-2.02r2/x11/gen_xpm/world/outside_1.xpm --- xevil-2.02r2/x11/gen_xpm/world/outside_1.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/outside_1.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *outside_1[] = { +static char *outside_1[] = { /* width height ncolors chars_per_pixel */ "100 100 5 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/outside_2.xpm xevil-2.02r2/x11/gen_xpm/world/outside_2.xpm --- xevil-2.02r2/x11/gen_xpm/world/outside_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/outside_2.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *outside_2[] = { +static char *outside_2[] = { /* width height ncolors chars_per_pixel */ "100 100 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/outside_3.xpm xevil-2.02r2/x11/gen_xpm/world/outside_3.xpm --- xevil-2.02r2/x11/gen_xpm/world/outside_3.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/outside_3.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *outside_3[] = { +static char *outside_3[] = { /* width height ncolors chars_per_pixel */ "128 128 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/outside_4.xpm xevil-2.02r2/x11/gen_xpm/world/outside_4.xpm --- xevil-2.02r2/x11/gen_xpm/world/outside_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/outside_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *outside_4[] = { +static char *outside_4[] = { /* width height ncolors chars_per_pixel */ "128 128 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/outside_5.xpm xevil-2.02r2/x11/gen_xpm/world/outside_5.xpm --- xevil-2.02r2/x11/gen_xpm/world/outside_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/outside_5.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *outside_5[] = { +static char *outside_5[] = { /* width height ncolors chars_per_pixel */ "96 96 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_0.xpm xevil-2.02r2/x11/gen_xpm/world/poster_0.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_0.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_0[] = { +static char *poster_0[] = { /* width height ncolors chars_per_pixel */ "160 96 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_10.xpm xevil-2.02r2/x11/gen_xpm/world/poster_10.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_10.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_10.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_10[] = { +static char *poster_10[] = { /* width height ncolors chars_per_pixel */ "96 96 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_11.xpm xevil-2.02r2/x11/gen_xpm/world/poster_11.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_11.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_11.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_11[] = { +static char *poster_11[] = { /* width height ncolors chars_per_pixel */ "128 64 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_12.xpm xevil-2.02r2/x11/gen_xpm/world/poster_12.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_12.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_12.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_12[] = { +static char *poster_12[] = { /* width height ncolors chars_per_pixel */ "32 32 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_13.xpm xevil-2.02r2/x11/gen_xpm/world/poster_13.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_13.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_13.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_13[] = { +static char *poster_13[] = { /* width height ncolors chars_per_pixel */ "352 160 64 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_1.xpm xevil-2.02r2/x11/gen_xpm/world/poster_1.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_1.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_1.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_1[] = { +static char *poster_1[] = { /* width height ncolors chars_per_pixel */ "64 64 9 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_2.xpm xevil-2.02r2/x11/gen_xpm/world/poster_2.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_2.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_2[] = { +static char *poster_2[] = { /* width height ncolors chars_per_pixel */ "32 32 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_3.xpm xevil-2.02r2/x11/gen_xpm/world/poster_3.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_3.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_3.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_3[] = { +static char *poster_3[] = { /* width height ncolors chars_per_pixel */ "96 96 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_4.xpm xevil-2.02r2/x11/gen_xpm/world/poster_4.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_4.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_4[] = { +static char *poster_4[] = { /* width height ncolors chars_per_pixel */ "64 32 8 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_5.xpm xevil-2.02r2/x11/gen_xpm/world/poster_5.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_5.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_5[] = { +static char *poster_5[] = { /* width height ncolors chars_per_pixel */ "64 64 3 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_6.xpm xevil-2.02r2/x11/gen_xpm/world/poster_6.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_6.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_6.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_6[] = { +static char *poster_6[] = { /* width height ncolors chars_per_pixel */ "64 64 4 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_7.xpm xevil-2.02r2/x11/gen_xpm/world/poster_7.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_7.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_7.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_7[] = { +static char *poster_7[] = { /* width height ncolors chars_per_pixel */ "64 64 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_8.xpm xevil-2.02r2/x11/gen_xpm/world/poster_8.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_8.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_8.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_8[] = { +static char *poster_8[] = { /* width height ncolors chars_per_pixel */ "32 32 6 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/world/poster_9.xpm xevil-2.02r2/x11/gen_xpm/world/poster_9.xpm --- xevil-2.02r2/x11/gen_xpm/world/poster_9.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/world/poster_9.xpm 2000-01-20 05:05:08.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *poster_9[] = { +static char *poster_9[] = { /* width height ncolors chars_per_pixel */ "128 32 7 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_0b.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_0b.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_0b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_0b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_0b[] = { +static char *yeti_0b[] = { /* width height ncolors chars_per_pixel */ "48 50 14 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_0c.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_0c.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_0c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_0c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_0c[] = { +static char *yeti_0c[] = { /* width height ncolors chars_per_pixel */ "48 50 14 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_0d.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_0d.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_0d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_0d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_0d[] = { +static char *yeti_0d[] = { /* width height ncolors chars_per_pixel */ "48 50 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_0.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_0.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_0.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_0.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_0[] = { +static char *yeti_0[] = { /* width height ncolors chars_per_pixel */ "48 50 14 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_10b.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_10b.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_10b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_10b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_10b[] = { +static char *yeti_10b[] = { /* width height ncolors chars_per_pixel */ "50 38 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_10c.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_10c.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_10c.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_10c.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_10c[] = { +static char *yeti_10c[] = { /* width height ncolors chars_per_pixel */ "50 38 12 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_10d.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_10d.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_10d.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_10d.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_10d[] = { +static char *yeti_10d[] = { /* width height ncolors chars_per_pixel */ "50 38 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_10e.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_10e.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_10e.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_10e.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_10e[] = { +static char *yeti_10e[] = { /* width height ncolors chars_per_pixel */ "50 38 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_10f.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_10f.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_10f.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_10f.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_10f[] = { +static char *yeti_10f[] = { /* width height ncolors chars_per_pixel */ "50 38 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_10.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_10.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_10.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_10.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_10[] = { +static char *yeti_10[] = { /* width height ncolors chars_per_pixel */ "50 38 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_18.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_18.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_18.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_18.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_18[] = { +static char *yeti_18[] = { /* width height ncolors chars_per_pixel */ "32 50 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_20b.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_20b.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_20b.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_20b.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_20b[] = { +static char *yeti_20b[] = { /* width height ncolors chars_per_pixel */ "32 50 10 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_25.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_25.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_25.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_25.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_25[] = { +static char *yeti_25[] = { /* width height ncolors chars_per_pixel */ "50 20 17 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_2.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_2.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_2.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_2.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_2[] = { +static char *yeti_2[] = { /* width height ncolors chars_per_pixel */ "50 50 15 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_4.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_4.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_4.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_4.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_4[] = { +static char *yeti_4[] = { /* width height ncolors chars_per_pixel */ "44 50 14 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_5.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_5.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_5.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_5.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_5[] = { +static char *yeti_5[] = { /* width height ncolors chars_per_pixel */ "44 50 13 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/gen_xpm/yeti/yeti_9.xpm xevil-2.02r2/x11/gen_xpm/yeti/yeti_9.xpm --- xevil-2.02r2/x11/gen_xpm/yeti/yeti_9.xpm 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/gen_xpm/yeti/yeti_9.xpm 2000-01-20 05:05:10.000000000 +0000 @@ -1,5 +1,5 @@ /* XPM */ -static const char *yeti_9[] = { +static char *yeti_9[] = { /* width height ncolors chars_per_pixel */ "40 38 14 1 0 0", /* colors */ diff -Nru xevil-2.02r2/x11/l_agreement_dlg.cpp xevil-2.02r2/x11/l_agreement_dlg.cpp --- xevil-2.02r2/x11/l_agreement_dlg.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/l_agreement_dlg.cpp 2000-01-19 20:55:04.000000000 +0000 @@ -31,6 +31,7 @@ #include } +#include #include "xdata.h" #include "panel.h" diff -Nru xevil-2.02r2/x11/main.cpp xevil-2.02r2/x11/main.cpp --- xevil-2.02r2/x11/main.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/main.cpp 2003-03-23 04:52:14.000000000 +0000 @@ -25,7 +25,6 @@ #include "utils.h" extern "C" { -#include #include #ifdef OPENWOUND_XOS_STRLEN_HACK @@ -34,13 +33,13 @@ #include } -#include +#include #include "utils.h" #include "neth.h" #include "game.h" -GameP g_game; + class TurnStarter: public ITurnStarter { public: @@ -69,7 +68,6 @@ Utils::seed_random(); GameP game = new Game(&argc,argv); - g_game = game; // assert (clock() != -1); diff -Nru xevil-2.02r2/x11/makefile xevil-2.02r2/x11/makefile --- xevil-2.02r2/x11/makefile 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/makefile 2000-01-19 21:14:04.000000000 +0000 @@ -72,7 +72,7 @@ $(CC) $(DEBUG_OPT) $(ALL_CFLAGS) $(ALL_INCL_DIRS) -o $(OBJ_DIR)/serverping.o -c serverping.cpp $(OBJ_DIR)/serverping:: $(OBJ_DIR)/serverping.o - $(CC) $(LINK_FLAGS) $(LINK_OPT) $(LIBS_DIRS) -o $(OBJ_DIR)/serverping $(OBJ_DIR)/serverping.o $(OBJ_DIR)/utils.o $(OBJ_DIR)/xetp_basic.o $(OBJ_DIR)/streams.o $(OBJ_DIR)/id.o -lm + $(CC) $(LINK_FLAGS) $(LINK_OPT) $(LIBS_DIRS) -o $(OBJ_DIR)/serverping $(OBJ_DIR)/serverping.o $(OBJ_DIR)/utils.o $(OBJ_DIR)/xetp_basic.o $(OBJ_DIR)/streams.o $(OBJ_DIR)/id.o $(LIBS) # $(STRIP) $(OBJ_DIR)/serverping diff -Nru xevil-2.02r2/x11/panel.cpp xevil-2.02r2/x11/panel.cpp --- xevil-2.02r2/x11/panel.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/panel.cpp 2003-03-23 04:50:44.000000000 +0000 @@ -31,14 +31,13 @@ #include #include } -#include -#include +#include +#include #include "utils.h" #include "xdata.h" #include "panel.h" -using namespace std; #define PANEL_BORDER 1 #define PANEL_MARGAIN 2 @@ -312,14 +311,15 @@ void WritePanel::update_message() { - stringstream tmp; + ostrstream tmp; if (active) { - tmp << prompt << value << "_"; + tmp << prompt << value << "_" << ends; } else { - tmp << prompt << value; + tmp << prompt << value << ends; } - set_message(tmp.str().c_str()); + set_message(tmp.str()); + delete tmp.str(); } @@ -524,8 +524,9 @@ return; } - stringstream tmp; - tmp << "CHAT <<" << value << "\nEnter to send, Esc to cancel."; - TextPanel::set_message(tmp.str().c_str()); + ostrstream tmp; + tmp << "CHAT <<" << value << "\nEnter to send, Esc to cancel." << ends; + TextPanel::set_message(tmp.str()); + delete tmp.str(); } diff -Nru xevil-2.02r2/x11/serverping.cpp xevil-2.02r2/x11/serverping.cpp --- xevil-2.02r2/x11/serverping.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/serverping.cpp 2003-03-23 05:55:12.000000000 +0000 @@ -25,15 +25,14 @@ // code and should be reasonably easy to compile on Windows. -#include -#include +#include +#include #include "utils.h" #include "streams.h" #include "xetp_basic.h" #include "neth.h" #include "id.h" -using namespace std; class ServerPing { @@ -114,7 +113,7 @@ char* sString = argv[argc - 1]; - const char* port = Utils::strchr(sString,':'); + char* port = Utils::strchr(sString,':'); // server:port if (port) { serverName = new char[port - sString + 1]; @@ -141,9 +140,10 @@ error("Error opening client UDP socket."); } - stringstream str; - str << "Looking up IP address for server " << serverName; - message(str.str().c_str()); + ostrstream str; + str << "Looking up IP address for server " << serverName << ends; + message(str.str()); + delete str.str(); // Create server address. memset((void *)&serverAddr,'\0',sizeof(serverAddr)); @@ -171,9 +171,10 @@ client.sin_addr.s_addr = htonl(INADDR_ANY); client.sin_port = htons((u_short)clientPort); if (bind(udpSock,(CMN_SOCKADDR *)&client,sizeof(client)) < 0) { - stringstream str; - str << "Could not bind local UDP port " << clientPort; - error(str.str().c_str()); + ostrstream str; + str << "Could not bind local UDP port " << clientPort << ends; + error(str.str()); + delete str.str(); return; } @@ -196,10 +197,11 @@ // Send "count" number of SERVER_PINGs. for (int tries = 0; tries < count; tries++) { // Send the ping. - stringstream msg; + ostrstream msg; msg << "Sending XETP::SERVER_PING to " - << serverName << ':' << serverPort; - message(msg.str().c_str()); + << serverName << ':' << serverPort << ends; + message(msg.str()); + delete msg.str(); XETPBasic::send_server_ping(udpOut); // Don't buffer the ping. udpOut->flush(); @@ -246,10 +248,11 @@ } // If we get here, we failed to reach the server. - stringstream msg; + ostrstream msg; msg << "No return from " << serverName << ':' << serverPort << " after " - << count << " tries."; - error(msg.str().c_str()); + << count << " tries." << ends; + error(msg.str()); + delete msg.str(); } @@ -268,9 +271,12 @@ void ServerPing::error(const char* msg1,const char* msg2) { - stringstream str; - str << msg1 << msg2; - error(str.str().c_str()); + ostrstream str; + str << msg1 << msg2 << ends; + error(str.str()); + + // Will never get here, but WTF. + delete str.str(); } diff -Nru xevil-2.02r2/x11/ui.cpp xevil-2.02r2/x11/ui.cpp --- xevil-2.02r2/x11/ui.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/ui.cpp 2003-03-19 18:05:38.000000000 +0000 @@ -30,7 +30,6 @@ #include "utils.h" extern "C" { #include -#include #include #ifdef OPENWOUND_XOS_STRLEN_HACK #define _strings_h @@ -41,8 +40,8 @@ #include } -#include -#include +#include +#include #include "coord.h" #include "area.h" @@ -60,7 +59,6 @@ #include "panel.h" #include "viewport.h" -using namespace std; // Defines #define DEFAULT_BIG_FONT_NAME "-*-helvetica-*-r-*-*-18-*-*-*-*-*-*-*" @@ -228,6 +226,20 @@ for (int d = 0; d < xvars.dpyMax; d++) { xvars.alloc_named_color(d,"steelblue"); } + + // Run the license agreement. + // Note: The license agreement will not be run if the user runs + // "xevil -server -no_ui". + // Must be after init_x(). + Boolean reduceDraw = Viewport::get_reduce_draw(); + Boolean accepted = + LAgreement::check_accepted(largeViewport,smoothScroll,reduceDraw, + xvars,0,argc,argv); + Viewport::set_reduce_draw(reduceDraw); + if (!accepted) { + // Should probably let game.cpp call exit. + exit(1); + } // Ick, this should be in init_x(), but we need to call init_x() before // running the License Agreement to get this information. @@ -449,27 +461,21 @@ } } - // If function keys are assigned to movement, weapon or item functions, - // then this code will not get executed. - if (down && !found) { - // Pause Game - if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_F1)) { - settingsChanges |= UIpause; - settings.pause = True; + if (down) { + // Restart game if space pressed. + // This doesn't always work, the otherInput flag might get cleared + // before it is used. + if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_space)) { + otherInput = True; } - // New Game - if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_F2)) { - settingsChanges |= UInewGame; - } - // Change game style - if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_F3)) { - settingsChanges |= UIstyle; - settings.style = (settings.style + 1) % NUM_GAME_STYLES; - - // Avoid the LEVELS_ONLY option. There was no button before - // I got here. Avoiding the ability to set it until I - // discover why - settings.style += (settings.style == LEVELS_ONLY) ? 1 : 0; + + if (!found) { + // Undocumented pause key feature. + // Don't do pause if XK_F1 is used for something else. + if (keycode == XKeysymToKeycode(xvars.dpy[dpyNum],XK_F1)) { + settingsChanges |= UIpause; + settings.pause = True; + } } } } @@ -859,7 +865,7 @@ char *msg; if (msg = locator->message_deq()) { set_message(msg); - delete [] msg; + delete msg; messageTimer.set(MESSAGE_TIME); } } @@ -924,7 +930,7 @@ UiP ui = (UiP)closure; ui->settingsChanges |= UIenemiesRefill; // SGI compiler says you can't cast void* to Boolean. - Boolean val = (Boolean)(long)value; + Boolean val = (Boolean)(int)value; ui->settings.enemiesRefill = val; } @@ -933,7 +939,7 @@ void Ui::menu_controls_CB(void* value,Viewport* vPort,void* closure) { UiP ui = (UiP)closure; int dpyNum = vPort->get_dpy_num(); - Boolean val = (Boolean)(long)value; + Boolean val = (Boolean)(int)value; if (val) { XMapWindow(ui->xvars.dpy[dpyNum],ui->xdata.controls[dpyNum]); } @@ -949,13 +955,13 @@ Viewport* vPort,void* closure) { UiP ui = (UiP)closure; int dpyNum = vPort->get_dpy_num(); - Boolean active = (Boolean)(long)value; + Boolean active = (Boolean)(int)value; if (active) { ui->lControls[dpyNum].input = ui->lControls[dpyNum].key = ui->lControls[dpyNum].which = 0; - stringstream str; + ostrstream str; str << "There are 2 sets of controls for the players on the right and" << "\n" << "left sides of the keyboard, respectively." << "\n" @@ -973,9 +979,10 @@ << " player enter the " << (ui->lControls[dpyNum].which ? "second" : "first") << " key for <" << ui->keysNames[ui->lControls[dpyNum].key] - << ">."; + << ">." << ends; - ui->learnControls[dpyNum]->set_message(str.str().c_str()); + ui->learnControls[dpyNum]->set_message(str.str()); + delete str.str(); XMapWindow(ui->xvars.dpy[dpyNum],ui->xdata.learnControls[dpyNum]); } else { @@ -987,7 +994,7 @@ void Ui::menu_scenarios_CB(void* value,Viewport*,void* closure) { UiP ui = (UiP)closure; - Boolean val = (Boolean)(long)value; + Boolean val = (Boolean)(int)value; if (val) { ui->settingsChanges |= UIstyle; ui->settings.style = SCENARIOS; @@ -998,7 +1005,7 @@ void Ui::menu_levels_CB(void* value,Viewport*,void* closure) { UiP ui = (UiP)closure; - Boolean val = (Boolean)(long)value; + Boolean val = (Boolean)(int)value; if (val) { ui->settingsChanges |= UIstyle; ui->settings.style = LEVELS; @@ -1009,7 +1016,7 @@ void Ui::menu_kill_CB(void* value,Viewport*,void* closure) { UiP ui = (UiP)closure; - Boolean val = (Boolean)(long)value; + Boolean val = (Boolean)(int)value; if (val) { ui->settingsChanges |= UIstyle; ui->settings.style = KILL; @@ -1020,7 +1027,7 @@ void Ui::menu_duel_CB(void* value,Viewport*,void* closure) { UiP ui = (UiP)closure; - Boolean val = (Boolean)(long)value; + Boolean val = (Boolean)(int)value; if (val) { ui->settingsChanges |= UIstyle; ui->settings.style = DUEL; @@ -1031,7 +1038,7 @@ void Ui::menu_extended_CB(void* value,Viewport*,void* closure) { UiP ui = (UiP)closure; - Boolean val = (Boolean)(long)value; + Boolean val = (Boolean)(int)value; if (val) { ui->settingsChanges |= UIstyle; ui->settings.style = EXTENDED; @@ -1042,7 +1049,7 @@ void Ui::menu_training_CB(void* value,Viewport*,void* closure) { UiP ui = (UiP)closure; - Boolean val = (Boolean)(long)value; + Boolean val = (Boolean)(int)value; if (val) { ui->settingsChanges |= UIstyle; ui->settings.style = TRAINING; @@ -1063,7 +1070,7 @@ void Ui::menu_cooperative_CB(void* value,Viewport*,void* closure) { UiP ui = (UiP)closure; ui->settingsChanges |= UIcooperative; - Boolean val = (Boolean)(long)value; + Boolean val = (Boolean)(int)value; ui->settings.cooperative = val; } @@ -1072,7 +1079,7 @@ void Ui::menu_help_CB(void* value,Viewport* vPort,void* closure) { UiP ui = (UiP)closure; int dpyNum = vPort->get_dpy_num(); - Boolean active = (Boolean)(long)value; + Boolean active = (Boolean)(int)value; if (active) { XMapWindow(ui->xvars.dpy[dpyNum],ui->xdata.help[dpyNum]); @@ -1087,7 +1094,7 @@ void Ui::status_weapon_CB(void* value,Viewport* vPort,void*) { // Some mouse controls. // UiP ui = (UiP)closure; - long button = (long)value; + int button = (int)value; switch (button) { case Button1: @@ -1106,7 +1113,7 @@ void Ui::status_item_CB(void* value,Viewport* vPort,void*) { // UiP ui = (UiP)closure; - long button = (long)value; + int button = (int)value; switch (button) { case Button1: @@ -1160,14 +1167,14 @@ return; } - stringstream str; + ostrstream str; str << (ui->lControls[dpyNum].input ? "Left" : "Right") << " player: The " << (ui->lControls[dpyNum].which ? "second" : "first") << " key for <" << ui->keysNames[ui->lControls[dpyNum].key] << "> is " << XKeysymToString(XKeycodeToKeysym(ui->xvars.dpy[dpyNum], event->xkey.keycode,0)) - << ".\n\n"; + << "." << "\n" << "\n"; ui->keycodes[dpyNum][ui->lControls[dpyNum].input] [ui->lControls[dpyNum].key][ui->lControls[dpyNum].which] = event->xkey.keycode; @@ -1215,18 +1222,21 @@ << " player enter the " << (ui->lControls[dpyNum].which ? "second" : "first") << " key for <" << keysNames[ui->lControls[dpyNum].key] - << ">."; + << ">." << ends; // Add message in front of str.str(). - stringstream fullStr; + ostrstream fullStr; if (ui->lControls[dpyNum].input == UI_KEYS_LEFT) { fullStr << "You may dismiss this dialog now if you only want to" << "\n" - << "set the controls for one player.\n\n"; + << "set the controls for one player." + << "\n" << "\n"; } - fullStr << str.str(); + fullStr << str.str() << ends; + delete str.str(); - ui->learnControls[dpyNum]->set_message(fullStr.str().c_str()); + ui->learnControls[dpyNum]->set_message(fullStr.str()); + delete fullStr.str(); ui->controls_redraw(dpyNum); } @@ -1527,7 +1537,7 @@ Line::set_text_columns(HELP_COLS); Page page(NULL,helpMessage); const PtrList& lines = page.get_lines(); - stringstream message; + ostrstream message; for (int n = 0; n < lines.length(); n++) { Line* line = (Line*)lines.get(n); char* text = line->alloc_text(); @@ -1535,6 +1545,7 @@ message << text << '\n'; delete [] text; } + message << ends; for (int dpyNum = 0; dpyNum < xvars.dpyMax; dpyNum++) { @@ -1553,8 +1564,10 @@ new TextPanel(dpyNum,xvars,xdata.help[dpyNum],pos,size); assert(help[dpyNum]); - help[dpyNum]->set_message(message.str().c_str()); + help[dpyNum]->set_message(message.str()); } // dpyNum + + delete message.str(); } @@ -1608,7 +1621,7 @@ // Loop through all keys. for (int n = 0; n < UI_KEYS_MAX; n++) { // String for right side. - stringstream str0; + strstream str0; str0 << keysNames[n] << ": " << XKeysymToString(keymaps[0][n][0][0]); if (keymaps[0][n][0][1] && strlen(XKeysymToString(keymaps[0][n][0][1]))) str0 << ", " << XKeysymToString(keymaps[0][n][0][1]); @@ -1618,9 +1631,10 @@ && strlen(XKeysymToString(keymaps[0][n][1][1]))) str0 << ", " << XKeysymToString(keymaps[0][n][1][1]); } + str0 << ends; // String for left side. - stringstream str1; + strstream str1; str1 << keysNames[n] << ": " << XKeysymToString(keymaps[1][n][0][0]); if (keymaps[1][n][0][1] && strlen(XKeysymToString(keymaps[1][n][0][1]))) { str1 << ", " << XKeysymToString(keymaps[1][n][0][1]); @@ -1631,6 +1645,7 @@ && strlen(XKeysymToString(keymaps[1][n][1][1]))) str1 << ", " << XKeysymToString(keymaps[1][n][1][1]); } + str1 << ends; // Draw key on left side. if (n != IT_CHAT) { // Chat meaningless for left player. @@ -1638,14 +1653,16 @@ xvars.fontSize[dpyNum].width, xvars.font[dpyNum]->max_bounds.ascent + p * xvars.fontSize[dpyNum].height, - str1.str().c_str(),str1.str().length()); + str1.str(),strlen(str1.str())); } // Draw on right side. XDrawString(xvars.dpy[dpyNum],xdata.controls[dpyNum],xvars.gc[dpyNum], xvars.fontSize[dpyNum].width * (CONTROLS_COLS / 2 + 1), xvars.font[dpyNum]->max_bounds.ascent + (p++) * xvars.fontSize[dpyNum].height, - str0.str().c_str(),str0.str().length()); + str0.str(),strlen(str0.str())); + delete str0.str(); + delete str1.str(); } p++; @@ -1676,7 +1693,7 @@ -const char *Ui::keysNames[UI_KEYS_MAX] = { +char *Ui::keysNames[UI_KEYS_MAX] = { "center", "right", "down_right", @@ -1735,7 +1752,7 @@ -const char* Ui::helpMessage = +char* Ui::helpMessage = "For full instructions, including NETWORK PLAY, see " "http://www.xevil.com/docs/instructions.html\n" "\n" diff -Nru xevil-2.02r2/x11/ui.h xevil-2.02r2/x11/ui.h --- xevil-2.02r2/x11/ui.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/ui.h 2000-01-19 20:53:26.000000000 +0000 @@ -338,7 +338,7 @@ // Variables. - static const char *keysNames[UI_KEYS_MAX]; + static char *keysNames[UI_KEYS_MAX]; char **argv; // Warning: Exposing the rep. int argc; @@ -402,7 +402,7 @@ // The callbacks to export to the Viewport. static ViewportCallback viewportCallbacks[VIEWPORT_CB_NUM]; - static const char* helpMessage; + static char* helpMessage; }; #endif diff -Nru xevil-2.02r2/x11/viewport.cpp xevil-2.02r2/x11/viewport.cpp --- xevil-2.02r2/x11/viewport.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/viewport.cpp 2000-01-19 20:54:14.000000000 +0000 @@ -44,9 +44,8 @@ #include #include } -#include +#include -using namespace std; #define TICK_BORDER_WIDTH 5 // border width big enough for a tick mark. #define TICK_WIDTH 3 @@ -61,14 +60,14 @@ #define COL_SHIFT 4 // Number of characters across for each menu button. -#define QUIT_LINE_LENGTH 4 -#define NEW_GAME_LINE_LENGTH 13 +#define QUIT_LINE_LENGTH 5 +#define NEW_GAME_LINE_LENGTH 9 #define HUMANS_NUM_LINE_LENGTH 9 #define ENEMIES_NUM_LINE_LENGTH 11 #define ENEMIES_REFILL_LINE_LENGTH 13 #define CONTROLS_LINE_LENGTH 13 #define LEARN_CONTROLS_LINE_LENGTH 12 -#define STYLE_LINE_LENGTH 16 +#define STYLE_LINE_LENGTH 11 #define SCENARIOS_LINE_LENGTH 9 #define LEVELS_LINE_LENGTH 6 #define KILL_LINE_LENGTH 16 @@ -1057,18 +1056,20 @@ void Viewport::set_menu_humans_num(int val) { assert(menusNum > menuHumansNum); - stringstream str; - str << val; - ((WritePanel *)menus[menuHumansNum])->set_value(str.str().c_str()); + ostrstream str; + str << val << ends; + ((WritePanel *)menus[menuHumansNum])->set_value(str.str()); + delete str.str(); } void Viewport::set_menu_enemies_num(int val) { assert(menusNum > menuEnemiesNum); - stringstream str; - str << val; - ((WritePanel *)menus[menuEnemiesNum])->set_value(str.str().c_str()); + ostrstream str; + str << val << ends; + ((WritePanel *)menus[menuEnemiesNum])->set_value(str.str()); + delete str.str(); } @@ -1127,9 +1128,10 @@ void Viewport::set_quanta(Quanta quanta) { assert(menusNum > menuQuanta); - stringstream str; - str << quanta; - ((WritePanel *)menus[menuQuanta])->set_value(str.str().c_str()); + ostrstream str; + str << quanta << ends; + ((WritePanel *)menus[menuQuanta])->set_value(str.str()); + delete str.str(); } @@ -1142,27 +1144,33 @@ void Viewport::set_humans_playing(int val) { - stringstream msg; + ostrstream msg; if (val == 1) { - msg << "1 Human"; + msg << "1 Human" << ends; } else { - msg << val << " Humans"; + msg << val << " Humans" << ends; } - humansPlaying->set_message(msg.str().c_str()); + char *msg_str = msg.str(); + + humansPlaying->set_message(msg_str); + delete msg_str; } void Viewport::set_enemies_playing(int val) { - stringstream msg; + ostrstream msg; if (val == 1) { - msg << "1 Enemy"; + msg << "1 Enemy" << ends; } else { - msg << val << " Enemies"; + msg << val << " Enemies" << ends; } - enemiesPlaying->set_message(msg.str().c_str()); + char *msg_str = msg.str(); + + enemiesPlaying->set_message(msg_str); + delete msg_str; } @@ -1624,7 +1632,7 @@ // Would be much better to put the radio-button logic in the Panel classes. if (pClosure->radio) { // SGI compiler says you can't cast void* to Boolean. - Boolean bValue = (Boolean)(long)value; + Boolean bValue = (Boolean)(int)value; if (!bValue) { ((TogglePanel*)panel)->set_value(True); } @@ -1693,7 +1701,7 @@ pos.y += xvars.fontSize[dpyNum].height; for (int n = 0; n < DIFFICULTY_LEVELS_NUM; n++) { - stringstream str; + ostrstream str; str << "[" << n; if (n == DIFF_NORMAL) { str << ",space] "; @@ -1701,9 +1709,10 @@ else { str << "] "; } - str << difficultyLevels[n].name; + str << difficultyLevels[n].name << ends; pos.y += xvars.fontSize[dpyNum].height; - draw_string(pos,str.str().c_str()); + draw_string(pos,str.str()); + delete str.str(); } XSetForeground(xvars.dpy[dpyNum],xvars.gc[dpyNum], @@ -1724,7 +1733,7 @@ -void Viewport::draw_string(const Pos &pos,const char *msg) { +void Viewport::draw_string(const Pos &pos,char *msg) { XDrawString(xvars.dpy[dpyNum],arena, xvars.gc[dpyNum], pos.x,pos.y + xvars.font[dpyNum]->max_bounds.ascent, @@ -1921,7 +1930,7 @@ new ButtonPanel(dpyNum,xvars,toplevel, pos,newGameUnit, Viewport::panel_callback,panelClosures.get(menuNewGame), - "New Game (F2)"); + "New Game"); assert(p); p->set_background(menuBg,False); pos.x += newGameUnit.width; @@ -2007,7 +2016,7 @@ new TextPanel(dpyNum,xvars,toplevel, pos,styleUnit, NULL,NULL, - "Game style: (F3)"); + "Game style:"); assert(p); // p->set_background(menuBg,False); pos.x += styleUnit.width; @@ -2185,24 +2194,33 @@ } const IntelStatus *status = intel->get_intel_status(); - statuses[statusName]->set_message(status->name); - - statuses[statusClassName]->set_message(status->className); - stringstream health; + ostrstream name; + name << status->name << ends; + statuses[statusName]->set_message(name.str()); + delete name.str(); + + ostrstream className; + className << status->className << ends; + statuses[statusClassName]->set_message(className.str()); + delete className.str(); + + ostrstream health; if (status->health == -1) { - health << "Dead"; + health << "Dead" << ends; } else { - health << status->health << " Health"; + health << status->health << " Health" << ends; } - statuses[statusHealth]->set_message(health.str().c_str()); + statuses[statusHealth]->set_message(health.str()); + delete health.str(); - stringstream mass; - mass << status->mass << " Mass"; - statuses[statusMass]->set_message(mass.str().c_str()); + ostrstream mass; + mass << status->mass << " Mass" << ends; + statuses[statusMass]->set_message(mass.str()); + delete mass.str(); - stringstream weapon; + ostrstream weapon; if (status->weaponClassId == A_None) { weapon << "No Weapon"; } @@ -2212,56 +2230,62 @@ if (status->ammo != PH_AMMO_UNLIMITED) { weapon << " (" << status->ammo << ")"; } + weapon << ends; statuses[statusWeapon]-> set_foreground(status->weaponReady ? xvars.green[dpyNum] : xvars.red[dpyNum],False); - statuses[statusWeapon]->set_message(weapon.str().c_str()); + statuses[statusWeapon]->set_message(weapon.str()); + delete weapon.str(); - stringstream item; + ostrstream item; if (status->itemClassId == A_None) { item << "No Item"; } else { item << status->item << " (" << status->itemCount << ")"; } - statuses[statusItem]->set_message(item.str().c_str()); + item << ends; + statuses[statusItem]->set_message(item.str()); + delete item.str(); - stringstream livesHKills; + ostrstream livesHKills; if (styleInfo->get_game_style_type() == EXTENDED) { // Takes soups into account. livesHKills << (status->humanKills - status->soups) - << " Human Kills"; + << " Human Kills" << ends; } else { if (status->lives == IT_INFINITE_LIVES) { // Does this case ever happen? I don't think so. - livesHKills << "Unlimited Lives"; + livesHKills << "Unlimited Lives" << ends; } else { if (status->lives == 1) { - livesHKills << "1 Life"; + livesHKills << "1 Life" << ends; } else { - livesHKills << status->lives << " Lives"; + livesHKills << status->lives << " Lives" << ends; } } } - statuses[statusLivesHKills]->set_message(livesHKills.str().c_str()); + statuses[statusLivesHKills]->set_message(livesHKills.str()); + delete livesHKills.str(); - stringstream killsMKills; + ostrstream killsMKills; if (styleInfo->get_game_style_type() == EXTENDED) { - killsMKills << status->enemyKills << " Machine Kills"; + killsMKills << status->enemyKills << " Machine Kills" << ends; } else { int kills = status->humanKills + status->enemyKills; if (kills == 1) { - killsMKills << "1 Kill"; + killsMKills << "1 Kill" << ends; } else { - killsMKills << kills << " Kills"; + killsMKills << kills << " Kills" << ends; } } - statuses[statusKillsMKills]->set_message(killsMKills.str().c_str()); + statuses[statusKillsMKills]->set_message(killsMKills.str()); + delete killsMKills.str(); } diff -Nru xevil-2.02r2/x11/viewport.h xevil-2.02r2/x11/viewport.h --- xevil-2.02r2/x11/viewport.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/viewport.h 2000-01-19 20:52:46.000000000 +0000 @@ -348,7 +348,7 @@ /* NOTE: Will draw everything if redrawArena is true, else just what has changed. */ - void draw_string(const Pos &pos,const char *msg); + void draw_string(const Pos &pos,char *msg); /* EFFECTS: Draw string msg using current GC on arena with upper left of character at position pos. */ diff -Nru xevil-2.02r2/x11/xdata.cpp xevil-2.02r2/x11/xdata.cpp --- xevil-2.02r2/x11/xdata.cpp 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/xdata.cpp 2000-01-19 20:54:14.000000000 +0000 @@ -1,5 +1,4 @@ /* - * WK - note to self - search for xpmcreate * XEvil(TM) Copyright (C) 1994,2000 Steve Hardt and Michael Judge * http://www.xevil.com * satan@xevil.com @@ -31,12 +30,11 @@ #include "xdata.h" #include "area.h" -#include +#include #include #include #include -using namespace std; // Means always allocate some color, even if it's really, really bad. @@ -49,16 +47,9 @@ int dpyNum,const Size& size, const char* title, long eventMask) { - - // Get Size of screen, so we can center Window - XWindowAttributes root_window_attributes; - XGetWindowAttributes(dpy[dpyNum],root[dpyNum], &root_window_attributes); - int left = (root_window_attributes.width - size.width) / 2; - int top = (root_window_attributes.height - size.height) / 3; - // Creates with 0 border width. Window toplevel = - XCreateSimpleWindow(dpy[dpyNum],root[dpyNum],left,top, + XCreateSimpleWindow(dpy[dpyNum],root[dpyNum],0,0, size.width,size.height, 0,windowBorder[dpyNum], windowBg[dpyNum]); @@ -99,9 +90,7 @@ XClassHint class_hints; class_hints.res_name = argv[0]; - - static char res_class[] = "XEvil"; - class_hints.res_class = res_class; + class_hints.res_class = "XEvil"; XSetWMProperties(dpy[dpyNum],toplevel, &windowName,&iconName,argv,argc, @@ -196,14 +185,14 @@ Boolean Xvars::load_pixmap(Drawable* pixmap,Drawable* mask, - int dpyNum, const char** xpmBits) { + int dpyNum,char** xpmBits) { return load_pixmap(pixmap,mask,dpyNum,xpmBits,is_stretched()); } Boolean Xvars::load_pixmap(Drawable* pixmap,Drawable* mask, - int dpyNum, const char** xpmBits,Boolean fullSize) { + int dpyNum,char** xpmBits,Boolean fullSize) { // Just load XPM as is. if (fullSize) { XpmAttributes attr; @@ -211,9 +200,9 @@ attr.closeness = XPM_CLOSENESS; attr.alloc_close_colors = True; - int val = + int val = XpmCreatePixmapFromData(dpy[dpyNum],root[dpyNum], - const_cast (xpmBits), + xpmBits, pixmap,mask, &attr); XpmFreeAttributes(&attr); @@ -223,7 +212,7 @@ ret = False; } - return ret; + return ret; } @@ -242,8 +231,9 @@ // Perhaps should use XpmReturnAllocPixels, neither gives the transparent // value. - int val = XpmCreateImageFromData(dpy[dpyNum], - const_cast (xpmBits), + int val = + XpmCreateImageFromData(dpy[dpyNum], + xpmBits, &srcImage,(mask ? &srcMask : (XImage**)NULL), &attr); srcSize.width = attr.width; diff -Nru xevil-2.02r2/x11/xdata.h xevil-2.02r2/x11/xdata.h --- xevil-2.02r2/x11/xdata.h 2022-02-01 01:54:12.000000000 +0000 +++ xevil-2.02r2/x11/xdata.h 2000-01-19 19:32:04.000000000 +0000 @@ -74,7 +74,7 @@ typedef XEvent *CMN_EVENTDATA; -typedef const char *CMN_COLOR; +typedef char *CMN_COLOR; @@ -132,14 +132,14 @@ transformations. Use scratch for all scratch calculations. */ Boolean load_pixmap(Drawable* pixmap,Drawable* mask, - int dpyNum, const char** xpmBits); + int dpyNum,char** xpmBits); /* MODIFIES: pixmap, mask */ /* EFFECTS: Load an XPM pixmap and mask from xpmBits. Only load mask if non-NULL. Reduce pixmap size by a factor of 2 if !xvars.is_stretched(). */ Boolean load_pixmap(Drawable* pixmap,Drawable* mask, - int dpyNum, const char** xpmBits,Boolean fullSize); + int dpyNum,char** xpmBits,Boolean fullSize); /* EFFECTS: Same as above load_pixmap() except caller explicitly specifies whether pixmap is fullSize or reduced by a factor of 2. */ /* NOTE: This method can be called before Xvars::stretch is set. */