speed-dreams/speed-dreams-code
7
1
Fork 1
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

Fix include guard name. Move declaration of webServer to webserver.h (WIP for #1179)

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8117 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 67fade8142fea57a0c8eef9931a9c13dfa4fc64d
Former-commit-id: ab42ffede7fe81f255a7abfefdce31d5ae48e62c
This commit is contained in:
beaglejoe 2022-04-25 01:41:10 +00:00
parent 3fc71a2745
commit 6e93a2deeb
5 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libs/tgfclient/guieventloop.cpp
View file

@ -22,9 +22,6 @@
#ifdef WEBSERVER #ifdef WEBSERVER
#include "webserver.h" #include "webserver.h"
extern NotificationManager notifications;
extern TGFCLIENT_API WebServer webServer;
#endif //WEBSERVER #endif //WEBSERVER

12
src/libs/tgfclient/webserver.h
View file

@ -23,8 +23,8 @@
*/ */
#ifdef WEBSERVER #ifdef WEBSERVER
#ifndef _SD_WEBSERVER_H_ #ifndef __SD_WEBSERVER_H__
#define _SD_WEBSERVER_H_ #define __SD_WEBSERVER_H__
#include "tgfclient.h" #include "tgfclient.h"
#include <vector> #include <vector>
#include <string> #include <string>
@ -32,6 +32,12 @@
#include <curl/curl.h> #include <curl/curl.h>
#include <car.h> #include <car.h>
class NotificationManager;
class TGFCLIENT_API WebServer;
extern NotificationManager notifications;
extern TGFCLIENT_API WebServer webServer;
struct webRequest_t { struct webRequest_t {
int id; int id;
std::string data; std::string data;
@ -133,7 +139,7 @@ class TGFCLIENT_API WebServer {
~WebServer(); ~WebServer();
}; };
#endif //_SD_WEBSERVER_H_ #endif //__SD_WEBSERVER_H__
#endif //WEBSERVER #endif //WEBSERVER

4
src/modules/racing/standardgame/raceinit.cpp
View file

@ -64,10 +64,6 @@
#include "raceinit.h" #include "raceinit.h"
#ifdef WEBSERVER
extern TGFCLIENT_API WebServer webServer;
#endif //WEBSERVER
static const char *aPszSkillLevelNames[] = ROB_VALS_LEVEL; static const char *aPszSkillLevelNames[] = ROB_VALS_LEVEL;
static const int NSkillLevels = (int)(sizeof(aPszSkillLevelNames)/sizeof(char*)); static const int NSkillLevels = (int)(sizeof(aPszSkillLevelNames)/sizeof(char*));

2
src/modules/racing/standardgame/racesituation.cpp
View file

@ -380,8 +380,6 @@ void ReSituationUpdater::runOneStep(double deltaTimeIncrement)
} }
#ifdef WEBSERVER #ifdef WEBSERVER
// webServer lap logger.
extern TGFCLIENT_API WebServer webServer;
//Find human cars //Find human cars
for (int i = 0; i < pCurrReInfo->s->_ncars; i++) { for (int i = 0; i < pCurrReInfo->s->_ncars; i++) {
if(pCurrReInfo->s->cars[i]->_driverType == RM_DRV_HUMAN){ if(pCurrReInfo->s->cars[i]->_driverType == RM_DRV_HUMAN){

1
src/modules/userinterface/legacymenu/confscreens/playerconfig.cpp
View file

@ -931,7 +931,6 @@ static void onWebserverLoginTest(void * /* dummy */)
std::string username = (*CurrPlayer)->webserverusername(); std::string username = (*CurrPlayer)->webserverusername();
std::string password = (*CurrPlayer)->webserverpassword(); std::string password = (*CurrPlayer)->webserverpassword();
extern TGFCLIENT_API WebServer webServer;
webServer.sendLogin(username.c_str(),password.c_str()); webServer.sendLogin(username.c_str(),password.c_str());
//request a redisplay //request a redisplay