X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=gameserver.c;h=1d513f47b7e416b7ffa5f9a309d27db785de86c7;hb=304647a7672165dd35ffe54884ed9aedcc9bf363;hp=e641256c2ddc7f292afd0ef9f0c970b0ee07c48b;hpb=15c0b8cb57ed5d10814103eaa0b5c06e8ae117e4;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/gameserver.c b/gameserver.c index e641256..1d513f4 100644 --- a/gameserver.c +++ b/gameserver.c @@ -6,12 +6,11 @@ #include #include #include +#include volatile sig_atomic_t sig_stop; #include "gameserver.h" -#include "highscores.c" -#include "servermonitor_server.c" #include "vg/vg_opt.h" #include "network_common.h" #include "gameserver_db.h" @@ -92,6 +91,9 @@ static void gameserver_player_join( int index ){ alloca( sizeof(netmsg_playeritem) + ADDON_UID_MAX ); item->inetmsg_id = k_inetmsg_playeritem; + netmsg_region *region = alloca( sizeof(netmsg_region) + NETWORK_REGION_MAX ); + region->inetmsg_id = k_inetmsg_region; + for( int i=0; iclient = i; + region->flags = client->region_flags; + u32 l = vg_strncpy( client->region, region->loc, NETWORK_REGION_MAX, + k_strncpy_always_add_null ); + size = sizeof(netmsg_region) + l + 1; + + gameserver_send_to_client( index, region, size, + k_nSteamNetworkingSend_Reliable ); } } @@ -503,7 +516,7 @@ static void gameserver_propogate_player_frame( int client_id, basic->sound_effects = 0; struct gameserver_client *c0 = &gameserver.clients[client_id]; - c0->instance = frame->instance_id; + c0->instance = frame->flags & NETMSG_PLAYERFRAME_INSTANCE_ID; for( int i=0; iinetmsg_id == k_inetmsg_region ){ + netmsg_region *region = msg->m_pData, + *prop = alloca( sizeof(netmsg_region) + NETWORK_REGION_MAX ); + + prop->inetmsg_id = k_inetmsg_region; + prop->client = client_id; + prop->flags = region->flags; + + u32 l = network_msgstring( + region->loc, msg->m_cbSize, sizeof(netmsg_region), + client->region, NETWORK_REGION_MAX ); + client->region_flags = region->flags; + + l = vg_strncpy( client->region, prop->loc, NETWORK_REGION_MAX, + k_strncpy_always_add_null ); + + gameserver_send_to_all( client_id, prop, sizeof(netmsg_region)+l+1, + k_nSteamNetworkingSend_Reliable ); + vg_info( "client %d moved to region: %s\n", client_id, client->region ); + } else { vg_warn( "Unknown inetmsg_id recieved from client. (%u)\n", tmp->inetmsg_id ); @@ -673,7 +706,7 @@ static enum request_status gameserver_cat_table( vg_strnull( &q, buf, 512 ); vg_strcat( &q, "SELECT * FROM \"" ); vg_strcat( &q, table_name ); - vg_strcat( &q, "\" ORDER BY time DESC LIMIT 10;" ); + vg_strcat( &q, "\" ORDER BY time ASC LIMIT 10;" ); if( !vg_strgood(&q) ) return k_request_status_out_of_memory; @@ -694,8 +727,8 @@ static enum request_status gameserver_cat_table( continue; vg_msg_frame( msg, "" ); - vg_msg_wkvu32( msg, "time", time ); - vg_msg_wkvu64( msg, "steamid", steamid ); + vg_msg_wkvnum( msg, "time", k_vg_msg_u32, 1, &time ); + vg_msg_wkvnum( msg, "steamid", k_vg_msg_u64, 1, &steamid ); char username[32]; if( db_getuserinfo( steamid, username, sizeof(username), NULL ) ) @@ -750,7 +783,8 @@ static void gameserver_process_user_request( db_request *db_req ){ if( !strcmp( endpoint, "scoreboard" ) ){ const char *mod = vg_msg_getkvstr( &data, "mod" ); const char *route = vg_msg_getkvstr( &data, "route" ); - u32 week = vg_msg_getkvu32( &data, "week", 0 ); + u32 week; + vg_msg_getkvintg( &data, "week", k_vg_msg_u32, &week, NULL ); if( week == NETWORK_LEADERBOARD_CURRENT_WEEK ){ gameserver_cat_table( &body, mod, route, @@ -794,7 +828,8 @@ static void gameserver_process_user_request( db_request *db_req ){ return; } - i32 centiseconds = vg_msg_getkvi32( &data, "time", -1 ); + i32 centiseconds; + vg_msg_getkvintg( &data, "time", k_vg_msg_i32, ¢iseconds, NULL ); if( centiseconds < 5*100 ){ gameserver_request_respond( k_request_status_client_error, res, NULL, msg ); @@ -803,7 +838,6 @@ static void gameserver_process_user_request( db_request *db_req ){ db_writeusertime( alltime_table, client->steamid, centiseconds, 1 ); db_writeusertime( weekly_table, client->steamid, centiseconds, 1 ); - gameserver_request_respond( k_request_status_ok, res, NULL, msg ); } else{ @@ -889,19 +923,6 @@ static u64 seconds_to_server_ticks( double s ){ return s / 0.01; } -static void test_runner( db_request *req ){ - vg_warn( "RUNNER\n" ); - char table[DB_TABLE_UID_MAX]; - if( db_get_highscore_table_name( "sr002-local-mp_mtzero", - "Coastal Run", 0, table ) ){ - if( db_writeusertime( table, 76561198072130043, 232, 1 ) ){ - vg_success( "Written time\n" ); - i32 v = db_readusertime( table, 76561198072130043 ); - vg_success( "Returned time: %u\n", v ); - } - } -} - int main( int argc, char *argv[] ){ signal( SIGINT, inthandler ); signal( SIGQUIT, inthandler ); @@ -911,21 +932,11 @@ int main( int argc, char *argv[] ){ while( vg_argp( argc, argv ) ){ if( vg_long_opt( "noauth" ) ) gameserver.auth_mode = eServerModeNoAuthentication; - - /* TODO: Options to override, ammend, remove etc */ } vg_set_mem_quota( 80*1024*1024 ); vg_alloc_quota(); - db_init(); - db_request *req = db_alloc_request(0); - if( req ){ - req->handler = test_runner; - db_send_request(req); - } - - monitor_start_server(); /* UNIX socket monitor */ /* steamworks init * --------------------------------------------------------------- */ @@ -976,23 +987,15 @@ int main( int argc, char *argv[] ){ u64 server_ticks = 8000, last_record_save = 8000, - last_scoreboard_gen = 0, - last_monitor_heartbeat = 0; + last_scoreboard_gen = 0; while( !sig_stop ){ - monitor_event_loop(); steamworks_event_loop( hsteampipe ); poll_connections(); usleep(10000); server_ticks ++; - if( server_ticks > - (last_monitor_heartbeat + seconds_to_server_ticks(10.0))){ - last_monitor_heartbeat = server_ticks; - monitor_heartbeat(); - } - if( db_killed() ) break; }