Merge branch 'master' of https://github.com/andreja6/G3D-Fun
This commit is contained in:
6
main.cpp
6
main.cpp
@@ -151,7 +151,7 @@ void OnError(int err, std::string msg = "")
|
|||||||
//usableApp->window()->setMouseVisible(true);
|
//usableApp->window()->setMouseVisible(true);
|
||||||
std::string emsg = "An unexpected error has occured and DUOM 5 has to quit. We're sorry!" + msg;
|
std::string emsg = "An unexpected error has occured and DUOM 5 has to quit. We're sorry!" + msg;
|
||||||
clearInstances();
|
clearInstances();
|
||||||
MessageBox(NULL, emsg.c_str(),"Dynamica Crash", MB_OK);
|
MessageBox(NULL, emsg.c_str(),"Hypercube Crash", MB_OK);
|
||||||
exit(err);
|
exit(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1550,7 +1550,7 @@ void Demo::onCreate(HWND parentWindow)
|
|||||||
|
|
||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
try{
|
try{
|
||||||
tempPath = ((std::string)getenv("temp")) + "/Dynamica";
|
tempPath = ((std::string)getenv("temp")) + "/Hypercube";
|
||||||
CreateDirectory(tempPath.c_str(), NULL);
|
CreateDirectory(tempPath.c_str(), NULL);
|
||||||
|
|
||||||
message = tempPath;
|
message = tempPath;
|
||||||
@@ -1587,7 +1587,7 @@ int main(int argc, char** argv) {
|
|||||||
|
|
||||||
if(hwndMain == NULL)
|
if(hwndMain == NULL)
|
||||||
{
|
{
|
||||||
MessageBox(NULL, "Failed to create HWND","Dynamica Crash", MB_OK);
|
MessageBox(NULL, "Failed to create HWND","Hypercube Crash", MB_OK);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
SendMessage(hwndMain, WM_SETICON, ICON_BIG,(LPARAM)LoadImage(GetModuleHandle(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE));
|
SendMessage(hwndMain, WM_SETICON, ICON_BIG,(LPARAM)LoadImage(GetModuleHandle(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE));
|
||||||
|
|||||||
Reference in New Issue
Block a user