celeron55/buildat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply coding style

Browse Source
This commit is contained in:
Perttu Ahola 2014-09-17 11:43:53 +03:00
parent 7eef5ef423
commit 7d78bad1de
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/main.cpp
View File

@ -142,7 +142,8 @@ static int customError(lua_State *L){
printf("---------------------\n");
printf("Backtrace\n");
for(size_t i = 0; i < backTrace.size(); i++){
printf("* %s on line %d", backTrace[i].fileName.c_str(), backTrace[i].lineNumber);
printf("* %s on line %d", backTrace[i].fileName.c_str(),
backTrace[i].lineNumber);
}
printf("\n---------------------\n");
@ -192,8 +193,10 @@ HelloPolycodeApp::HelloPolycodeApp(Polycode::PolycodeView *view):
// SDLCore for Linux
core = new POLYCODE_CORE(view, 640, 480, false, false, 0, 0, 90, 1, true);
Polycode::CoreServices::getInstance()->getResourceManager()->addArchive(g_client_config.share_path+"/default.pak");
Polycode::CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
Polycode::CoreServices::getInstance()->getResourceManager()->addArchive(
g_client_config.share_path+"/default.pak");
Polycode::CoreServices::getInstance()->getResourceManager()->addDirResource("default",
false);
scene = new Polycode::Scene(Polycode::Scene::SCENE_2D);
scene->getActiveCamera()->setOrthoSize(640, 480);

3
src/server/rccpp.cpp
View File

@ -155,7 +155,8 @@ void* CCompiler::construct(const char *name, interface::Server *server){
auto it = constructed_objects.find(std::string(name));
if(it == constructed_objects.end()) constructed_objects.insert(std::make_pair(name, std::vector<void*> {result}));
if(it == constructed_objects.end()) constructed_objects.insert(std::make_pair(
name, std::vector<void*> {result}));
else it->second.push_back(result);
return result;

6
test/testmodules/__loader/server/init.cpp
View File

@ -15,7 +15,8 @@ struct Module: public interface::Module
Module(interface::Server *server):
m_server(server),
m_EventType_core_load_modules(interface::getGlobalEventRegistry()->type("core:load_modules"))
m_EventType_core_load_modules(
interface::getGlobalEventRegistry()->type("core:load_modules"))
{
std::cout<<"__loader construct"<<std::endl;
}
@ -34,7 +35,8 @@ struct Module: public interface::Module
void load_modules()
{
m_server->load_module("network", m_server->get_builtin_modules_path()+"/network");
m_server->load_module("network",
m_server->get_builtin_modules_path()+"/network");
sv_<ss_> load_list = {"test1", "test2"};
for(const ss_ &name : load_list){

3
test/testmodules/test1/server/init.cpp
View File

@ -15,7 +15,8 @@ struct Module: public interface::Module
Module(interface::Server *server):
m_server(server),
m_EventType_test1_thing(interface::getGlobalEventRegistry()->type("test1:thing"))
m_EventType_test1_thing(
interface::getGlobalEventRegistry()->type("test1:thing"))
{
std::cout<<"test1 construct"<<std::endl;
}