OpenXcom Forum
Contributions => Programming => Topic started by: pmprog on November 08, 2012, 09:58:43 am
-
SupSuper has not merged my pull, something about how I should be overloading similar states. So I modified the code, as you can see here, but it doesn't work. It still always runs the base class code. I've done overriding and abstract classes before, and I can't see anything I've done wrong. Anyone got any ideas?
https://github.com/pmprog/OpenXcom/commit/7f75444a5bb4ba140bb2f9bf060146d938f73078
-
Sooo, figured this out.
Technically, the code was fine. The problem is that you can't call derived class's functions whilst in the constructor! I never knew that...
Anyway, there's a new pull with the updated code
-
Sooo, figured this out.
Technically, the code was fine. The problem is that you can't call derived class's functions whilst in the constructor! I never knew that...
Anyway, there's a new pull with the updated code
Funny, I didn't know that either. That's another reason the State::init() function is so handy. Learn something new everyday. :)
-
Great, get it pulled so I can refork and start playing around with more stuff :)
I really need to remember to create branches before I do commits... Maybe one day ;D
-
I thought I already had... ???
"This pull request cannot be automatically merged."
What did you dooooooooooooo? :P (that means there's a conflict I have to manually solve) Now I'm actually gonna have to *gasp* use the Git console. :P
-
Crap, I have no idea. Sorry :(
Should have been fine
-
src/engine/options.ccp
-<<<<<<< HEAD
setInt("pauseMode", 0);
-=======
setBool("customInitialBase", false);
->>>>>>> pmprog/AbstractVersion
-
Should be all fixed now. :)