X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FDevtools%2FConsoleCmds.cpp;h=10f37e81398eb6cbdf3a0a9701911d38cb04f848;hb=aff8402e75951f0407020e7fa7c69f831c141ba1;hp=84252e3040a92a84943bb0a30411550d9092cb97;hpb=58e2a577c2ea4cf639a07fc792122c288d4bc2a5;p=lugaru.git diff --git a/Source/Devtools/ConsoleCmds.cpp b/Source/Devtools/ConsoleCmds.cpp index 84252e3..10f37e8 100644 --- a/Source/Devtools/ConsoleCmds.cpp +++ b/Source/Devtools/ConsoleCmds.cpp @@ -121,7 +121,7 @@ static void set_noclothes(int pnum, const char*) { Person::players[pnum]->numclothes = 0; Person::players[pnum]->skeleton.drawmodel.textureptr.load( - creatureskin[Person::players[pnum]->creature][Person::players[pnum]->whichskin], 1, + PersonType::types[Person::players[pnum]->creature].skins[Person::players[pnum]->whichskin], 1, &Person::players[pnum]->skeleton.skinText[0], &Person::players[pnum]->skeleton.skinsize); } @@ -160,6 +160,18 @@ static void set_clothes(int pnum, const char* args) Person::players[pnum]->DoMipmaps(); } +static void list_clothes(int pnum) +{ + printf("Clothes from player %d:\n", pnum); + for (int i = 0; i < Person::players[pnum]->numclothes; i++) { + printf("%s (%f %f %f)\n", + Person::players[pnum]->clothes[i], + Person::players[pnum]->clothestintr[i], + Person::players[pnum]->clothestintg[i], + Person::players[pnum]->clothestintb[i]); + } +} + /* Console commands themselves */ void ch_quit(const char*) @@ -311,7 +323,7 @@ void ch_save(const char* args) void ch_cellar(const char*) { - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Furdarko.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurDarko.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); } void ch_tint(const char* args) @@ -438,6 +450,19 @@ void ch_clothesnear(const char* args) } } +void ch_clotheslist(const char*) +{ + list_clothes(0); +} + +void ch_clotheslistnear(const char*) +{ + int closest = findClosestPlayer(); + if (closest >= 0) { + list_clothes(closest); + } +} + void ch_belt(const char*) { Person::players[0]->skeleton.clothes = !Person::players[0]->skeleton.clothes; @@ -469,37 +494,37 @@ void ch_wolfie(const char*) void ch_wolf(const char*) { - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Wolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurWolfGrey.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); } void ch_snowwolf(const char*) { - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/SnowWolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurWolfSnow.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); } void ch_darkwolf(const char*) { - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/DarkWolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurWolfDark.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); } void ch_lizardwolf(const char*) { - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/LizardWolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurWolfLizard.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); } void ch_white(const char*) { - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurWhite.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); } void ch_brown(const char*) { - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur3.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurBrown.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); } void ch_black(const char*) { - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur2.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurBlack.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); } void ch_sizemin(const char*) @@ -638,13 +663,17 @@ void ch_default(const char*) Person::players[0]->metallow = 1; Person::players[0]->power = 1; Person::players[0]->speedmult = 1; - Person::players[0]->scale = 1; + if (Person::players[0]->creature == wolftype) { + Person::players[0]->scale = .23; + } else if (Person::players[0]->creature == rabbittype) { + Person::players[0]->scale = .2; + } Person::players[0]->setProportions(1, 1, 1, 1); Person::players[0]->numclothes = 0; Person::players[0]->skeleton.drawmodel.textureptr.load( - creatureskin[Person::players[0]->creature][Person::players[0]->whichskin], 1, + PersonType::types[Person::players[0]->creature].skins[Person::players[0]->whichskin], 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); editoractive = typeactive;