teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Combine ShowVarsImplicit and ShowVarsExplicit

Browse source 
Also removes an unnecessary else statement
This commit is contained in:
Chris Robinson 2013-08-13 17:31:15 -07:00
parent 30973352e8
commit c1dfa980bf
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/openmw/mwscript/miscextensions.cpp
View file

@ -632,9 +632,9 @@ namespace MWScript
}; };
class OpShowVarsExplicit : public Interpreter::Opcode0 template <class R>
class OpShowVars : public Interpreter::Opcode0
{ {
protected:
void printLocalVars(Interpreter::Runtime &runtime, const MWWorld::Ptr &ptr) void printLocalVars(Interpreter::Runtime &runtime, const MWWorld::Ptr &ptr)
{ {
std::stringstream str; std::stringstream str;
@ -675,16 +675,6 @@ namespace MWScript
runtime.getContext().report(str.str()); runtime.getContext().report(str.str());
} }
public:
virtual void execute (Interpreter::Runtime& runtime)
{
MWWorld::Ptr ptr = ExplicitRef()(runtime);
printLocalVars(runtime, ptr);
}
};
class OpShowVarsImplicit : public OpShowVarsExplicit
{
void printGlobalVars(Interpreter::Runtime &runtime) void printGlobalVars(Interpreter::Runtime &runtime)
{ {
std::stringstream str; std::stringstream str;
@ -701,8 +691,6 @@ namespace MWScript
str<<std::endl<< " "<<names[i]<<" = "<<world->getGlobalVariable(names[i]).mLong<<" (long)"; str<<std::endl<< " "<<names[i]<<" = "<<world->getGlobalVariable(names[i]).mLong<<" (long)";
else if(type == 'f') else if(type == 'f')
str<<std::endl<< " "<<names[i]<<" = "<<world->getGlobalVariable(names[i]).mFloat<<" (float)"; str<<std::endl<< " "<<names[i]<<" = "<<world->getGlobalVariable(names[i]).mFloat<<" (float)";
else
str<<std::endl<< " "<<names[i]<<" = "<<((void*)*(int*)&world->getGlobalVariable(names[i]).mLong)<<" (unknown)";
} }
runtime.getContext().report(str.str()); runtime.getContext().report(str.str());
@ -714,7 +702,7 @@ namespace MWScript
// No way to tell if we have a reference before trying to get it, and it will // No way to tell if we have a reference before trying to get it, and it will
// cause an exception is there isn't one :( // cause an exception is there isn't one :(
try { try {
MWWorld::Ptr ptr = ImplicitRef()(runtime); MWWorld::Ptr ptr = R()(runtime);
printLocalVars(runtime, ptr); printLocalVars(runtime, ptr);
} }
catch(std::runtime_error&) { catch(std::runtime_error&) {
@ -780,8 +768,8 @@ namespace MWScript
interpreter.installSegment5 (Compiler::Misc::opcodeHitOnMeExplicit, new OpHitOnMe<ExplicitRef>); interpreter.installSegment5 (Compiler::Misc::opcodeHitOnMeExplicit, new OpHitOnMe<ExplicitRef>);
interpreter.installSegment5 (Compiler::Misc::opcodeDisableTeleporting, new OpEnableTeleporting<false>); interpreter.installSegment5 (Compiler::Misc::opcodeDisableTeleporting, new OpEnableTeleporting<false>);
interpreter.installSegment5 (Compiler::Misc::opcodeEnableTeleporting, new OpEnableTeleporting<true>); interpreter.installSegment5 (Compiler::Misc::opcodeEnableTeleporting, new OpEnableTeleporting<true>);
interpreter.installSegment5 (Compiler::Misc::opcodeShowVars, new OpShowVarsImplicit); interpreter.installSegment5 (Compiler::Misc::opcodeShowVars, new OpShowVars<ImplicitRef>);
interpreter.installSegment5 (Compiler::Misc::opcodeShowVarsExplicit, new OpShowVarsExplicit); interpreter.installSegment5 (Compiler::Misc::opcodeShowVarsExplicit, new OpShowVars<ExplicitRef>);
} }
} }
} }