mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 23:54:35 +00:00
Dedicated server fixes I think
This commit is contained in:
parent
aa6d9b8ec2
commit
b37bbf2d05
3 changed files with 40 additions and 10 deletions
|
|
@ -176,7 +176,7 @@ void MenuBar::attachToCanvas(GuiCanvas *owner, S32 pos)
|
||||||
|
|
||||||
mCanvas->setMenuBar( base );
|
mCanvas->setMenuBar( base );
|
||||||
}
|
}
|
||||||
|
#ifndef TORQUE_DEDICATED
|
||||||
for (S32 i = 0; i < size(); ++i)
|
for (S32 i = 0; i < size(); ++i)
|
||||||
{
|
{
|
||||||
PopupMenu *mnu = dynamic_cast<PopupMenu *>(at(i));
|
PopupMenu *mnu = dynamic_cast<PopupMenu *>(at(i));
|
||||||
|
|
@ -191,7 +191,7 @@ void MenuBar::attachToCanvas(GuiCanvas *owner, S32 pos)
|
||||||
|
|
||||||
mnu->attachToMenuBar(owner, pos + i);
|
mnu->attachToMenuBar(owner, pos + i);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void MenuBar::removeFromCanvas()
|
void MenuBar::removeFromCanvas()
|
||||||
|
|
@ -201,6 +201,7 @@ void MenuBar::removeFromCanvas()
|
||||||
|
|
||||||
//_FindMenuBarCtrl()->clearMenus();
|
//_FindMenuBarCtrl()->clearMenus();
|
||||||
|
|
||||||
|
#ifndef TORQUE_DEDICATED
|
||||||
// Add the items
|
// Add the items
|
||||||
for (S32 i = 0; i < size(); ++i)
|
for (S32 i = 0; i < size(); ++i)
|
||||||
{
|
{
|
||||||
|
|
@ -215,6 +216,7 @@ void MenuBar::removeFromCanvas()
|
||||||
}
|
}
|
||||||
|
|
||||||
mCanvas->setMenuBar(NULL);
|
mCanvas->setMenuBar(NULL);
|
||||||
|
#endif
|
||||||
|
|
||||||
mCanvas = NULL;
|
mCanvas = NULL;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
29
Tools/CMake/modules/module_dedicated.cmake
Normal file
29
Tools/CMake/modules/module_dedicated.cmake
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
# Copyright (c) 2014 GarageGames, LLC
|
||||||
|
#
|
||||||
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
# of this software and associated documentation files (the "Software"), to
|
||||||
|
# deal in the Software without restriction, including without limitation the
|
||||||
|
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||||
|
# sell copies of the Software, and to permit persons to whom the Software is
|
||||||
|
# furnished to do so, subject to the following conditions:
|
||||||
|
#
|
||||||
|
# The above copyright notice and this permission notice shall be included in
|
||||||
|
# all copies or substantial portions of the Software.
|
||||||
|
#
|
||||||
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||||
|
# IN THE SOFTWARE.
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
option(TORQUE_DEDICATED "Dedicated Server" OFF)
|
||||||
|
mark_as_advanced(TORQUE_DEDICATED)
|
||||||
|
|
||||||
|
if(TORQUE_DEDICATED)
|
||||||
|
# Project defines
|
||||||
|
addDef( "TORQUE_DEDICATED" )
|
||||||
|
endif()
|
||||||
|
|
@ -80,7 +80,6 @@ if(WIN32)
|
||||||
#mark_as_advanced(TORQUE_OPENGL)
|
#mark_as_advanced(TORQUE_OPENGL)
|
||||||
else()
|
else()
|
||||||
set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac
|
set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac
|
||||||
option(TORQUE_DEDICATED "Torque dedicated" OFF)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue