diff --git a/Descent3/AImain.cpp b/Descent3/AImain.cpp index e5b384fe..6f61930a 100644 --- a/Descent3/AImain.cpp +++ b/Descent3/AImain.cpp @@ -1978,8 +1978,8 @@ bool goal_do_avoid_walls(object *obj, vector *mdir) { } } - // mprintf((0, "Dist %f %f (%d, %d)\n", dist, scale, facelist[i].room_index, - //facelist[i].face_index)); + // mprintf((0, "Dist %f %f (%d, %d)\n", dist, scale, + //facelist[i].room_index, facelist[i].face_index)); if (dist < closest_dist) { closest_dist = dist; @@ -2999,8 +2999,8 @@ bool AINotify(object *obj, ubyte notify_type, void *info) { { if (!(Game_mode & GM_MULTI)) { for (i = 0; i < AI_NumRendered; i++) { - // mprintf((0, "I know that I could dodge, if I was aware, says robot %d.\n", - //AI_RenderedList[i])); + // mprintf((0, "I know that I could dodge, if I was aware, says robot + //%d.\n", AI_RenderedList[i])); if (!BOA_IsVisible(Objects[AI_RenderedList[i]].roomnum, other_obj->roomnum)) continue; @@ -3037,7 +3037,7 @@ bool AINotify(object *obj, ubyte notify_type, void *info) { } else { for (i = 0; i <= Highest_object_index; i++) { // mprintf((0, "I know that I could dodge, if I was aware, says robot %d.\n", - //AI_RenderedList[i])); + // AI_RenderedList[i])); if (Objects[i].control_type != CT_AI || Objects[i].type == OBJ_NONE) continue; @@ -3058,7 +3058,7 @@ bool AINotify(object *obj, ubyte notify_type, void *info) { if (to_weapon * fov_vec >= Objects[i].ai_info->fov) { // mprintf((0, "I am fired upon says robot %d\n", - //AI_RenderedList[i])); + // AI_RenderedList[i])); if (ai_info->notify_flags & (0x00000001 << notify_type)) { ai_info->memory[0].num_enemy_shots_dodged++; GoalAddGoal(&Objects[i], AIG_DODGE_OBJ, (void *)&obj->handle, ACTIVATION_BLEND_LEVEL, 1.0f, @@ -4976,11 +4976,11 @@ void ai_move(object *obj) { int g_status = cur_goal->status_reg; - // if((ai_info->ai_type == AIT_MELEE1) && (ai_info->status_reg & - //AISR_MELEE)) + // if((ai_info->ai_type == AIT_MELEE1) && (ai_info->status_reg + //& AISR_MELEE)) // { - // AIMoveTowardsPosition(obj, &ai_info->last_see_target_pos, - //ai_info->attack_vel_percent); + // AIMoveTowardsPosition(obj, + //&ai_info->last_see_target_pos, ai_info->attack_vel_percent); // } // else @@ -5299,7 +5299,7 @@ void ai_fire(object *obj) { pm->poly_wb[i].gp_index[aiming_gp_index]); // mprintf((0, "Weapon %f, %f, %f and normal %f, %f, %f\n", XYZ(&gun_point), - //XYZ(&gun_normal))); + // XYZ(&gun_normal))); target_dir[WB_MOVE_STILL] = ai_info->last_see_target_pos - gun_point[WB_MOVE_STILL]; target_dir[WB_MOVE_RIGHT] = ai_info->last_see_target_pos - gun_point[WB_MOVE_RIGHT]; diff --git a/Descent3/BOA.cpp b/Descent3/BOA.cpp index 7980f6de..71e3723b 100644 --- a/Descent3/BOA.cpp +++ b/Descent3/BOA.cpp @@ -763,7 +763,8 @@ void compute_terrain_region_info() { // if(region != 0) // { // BOA_connect[0][BOA_num_connect[region]].roomnum = - //Rooms[i].portals[j].croom; BOA_connect[0][BOA_num_connect[region]].portal = Rooms[i].portals[j].cportal; + // Rooms[i].portals[j].croom; BOA_connect[0][BOA_num_connect[region]].portal = + // Rooms[i].portals[j].cportal; // } if (!(Rooms[Rooms[i].portals[j].croom].flags & RF_EXTERNAL)) { @@ -2766,10 +2767,10 @@ void ComputeAABB(bool f_full) { int diff[3]; // mprintf((0, "Split plane results r %d s %d n %d\n", i, j, - //rp->num_bbf[j])); + // rp->num_bbf[j])); for (sp = 0; sp < 3; sp++) { // mprintf((0, "%d %d %d\n", num_faces[sp][0], - //num_faces[sp][1], num_faces[sp][2])); + // num_faces[sp][1], num_faces[sp][2])); if (abs(num_faces[sp][0] - num_faces[sp][1]) > abs(num_faces[sp][1] - num_faces[sp][2])) diff[sp] = abs(num_faces[sp][0] - num_faces[sp][1]); diff --git a/Descent3/Controls.cpp b/Descent3/Controls.cpp index 8699148d..d30ebca1 100644 --- a/Descent3/Controls.cpp +++ b/Descent3/Controls.cpp @@ -922,8 +922,8 @@ void DoKeyboardMovement(game_controls *controls) { // check keyboard controls first. // do thrust and orientation controls. since packet contains time since last call, frametime is taken into - //account. note that the ctDigital packets are for those rare cases where a key is down, but there is no key down time - // registered as of yet, which happens on some systems. + // account. note that the ctDigital packets are for those rare cases where a key is down, but there is no key down + // time registered as of yet, which happens on some systems. dx = (key_x1.value - key_x0.value); dy = (key_y1.value - key_y0.value); dz = (key_z1.value - key_z0.value); diff --git a/Descent3/Mission.cpp b/Descent3/Mission.cpp index 3d742f1b..822dc191 100644 --- a/Descent3/Mission.cpp +++ b/Descent3/Mission.cpp @@ -1682,7 +1682,7 @@ bool InitMissionScript() { //@@ fp = cfopen(DEFAULT_SCROBJ_NAME, "rb"); //@@ if (!fp) { //@@ DoMessageBox("Error", "Unable to find mission script.", MSGBOX_OK, UICOL_WINDOW_TITLE, - //UICOL_TEXT_NORMAL); + // UICOL_TEXT_NORMAL); //@@ mprintf((0, "Unable to open default script. Loading null script...\n")); //@@ return false; //@@ } @@ -1690,7 +1690,7 @@ bool InitMissionScript() { //@@ Current_mission.d3xmod = D3XLoadProgram(fp); //@@ if (!Current_mission.d3xmod) { //@@ DoMessageBox("Error", "Unable to find mission script.", MSGBOX_OK, UICOL_WINDOW_TITLE, - //UICOL_TEXT_NORMAL); + // UICOL_TEXT_NORMAL); //@@ mprintf((0, "Unable to open default script. Loading null script...\n")); //@@ return false; //@@ } diff --git a/Descent3/NewPyroGauges.cpp b/Descent3/NewPyroGauges.cpp index 4d9e230a..63a41d8f 100644 --- a/Descent3/NewPyroGauges.cpp +++ b/Descent3/NewPyroGauges.cpp @@ -97,7 +97,7 @@ void NewPyroShieldGauge(tGauge *gauge, tGaugePos *pos) { //@@ parentvp->set_text_color(GR_RGB(255,128,128)); //@@ parentvp->set_text_spacing(0); //@@ rend_SetCharacterParameters (parentvp->get_text_color(), parentvp->get_text_color(), - //parentvp->get_text_color(), parentvp->get_text_color()); + // parentvp->get_text_color(), parentvp->get_text_color()); //@@ sprintf(str, "%d", (int)Players[Player_num].shields); //@@ x = cx - (parentvp->get_text_line_width(str)/2); //@@ y = cy - (parentvp->get_current_font_height()/2); @@ -227,7 +227,7 @@ void NewPyroEnergyDigitalGauge(tGauge *gauge, tGaugePos *pos) { //@@ parentvp->set_text_color(GR_RGB(192,192,128)); //@@ parentvp->set_text_spacing(0); //@@ rend_SetCharacterParameters (parentvp->get_text_color(), parentvp->get_text_color(), - //parentvp->get_text_color(), parentvp->get_text_color()); + // parentvp->get_text_color(), parentvp->get_text_color()); //@@ sprintf(str, "%d", (int)Players[Player_num].energy); //@@ x = cx - (parentvp->get_text_line_width(str)/2); //@@ y = cy - (parentvp->get_current_font_height()/2); @@ -309,7 +309,7 @@ void NewPyroPrimaryWeaponGauge(tGauge *gauge, tGaugePos *pos) { //@@ parentvp->set_text_color(GR_RGB(0,192,0)); //@@ parentvp->set_text_spacing(0); //@@ rend_SetCharacterParameters (parentvp->get_text_color(), parentvp->get_text_color(), - //parentvp->get_text_color(), parentvp->get_text_color()); + // parentvp->get_text_color(), parentvp->get_text_color()); //@@ sprintf(str, "%s", Weapons[Players[Player_num].primary_weapon].name); //@@ x = cx - (parentvp->get_text_line_width(str)/3); //@@ y = cy - (parentvp->get_current_font_height()/3); @@ -388,7 +388,7 @@ void NewPyroSecondaryWeaponGauge(tGauge *gauge, tGaugePos *pos) { //@@ parentvp->set_text_color(GR_RGB(0,192,0)); //@@ parentvp->set_text_spacing(0); //@@ rend_SetCharacterParameters (parentvp->get_text_color(), parentvp->get_text_color(), - //parentvp->get_text_color(), parentvp->get_text_color()); + // parentvp->get_text_color(), parentvp->get_text_color()); //@@ sprintf(str, "%s", Weapons[Players[Player_num].secondary_weapon].name); //@@ x = cx - (parentvp->get_text_line_width(str)/1.5f); //@@ y = cy - (parentvp->get_current_font_height()/3); diff --git a/Descent3/OsirisLoadandBind.cpp b/Descent3/OsirisLoadandBind.cpp index d459780e..8bd71e4c 100644 --- a/Descent3/OsirisLoadandBind.cpp +++ b/Descent3/OsirisLoadandBind.cpp @@ -2076,7 +2076,7 @@ void Osiris_DisableCreateEvents(void) { Osiris_create_events_disabled = true; } // Purpose: // Enables any events involved when an object is created. This is to be used for // Loading games/viewing demos, as so not to re-initialize good data. (call when done with -//Osiris_DisableCreateEvents()) +// Osiris_DisableCreateEvents()) void Osiris_EnableCreateEvents(void) { Osiris_create_events_disabled = false; } // Osiris_IsEventEnabled @@ -3380,8 +3380,10 @@ void Osiris_OMMS_Detach(OMMSHANDLE handle); // Only has affect if you are attached to the memory. Memory will _ONLY_ be deleted when the // following conditions are meant for the shared memory block: // 1) The reference count for the global memory is at 0 (OMMS_Attach() adds to reference count, OMMS_Detach() -//subtracts). 2) OMMS_Free() has been called for the block of global memory. The conditions can happen in any order, but -//as soon as both are satisfied, the memory becomes deleted and any pointer returned by OMMS_Attach() becomes invalid. +// subtracts). 2) OMMS_Free() has been called for the block of global memory. The conditions can happen in any order, +// but +// as soon as both are satisfied, the memory becomes deleted and any pointer returned by OMMS_Attach() becomes +// invalid. // // handle : the value returned by OMMS_Malloc() void Osiris_OMMS_Free(OMMSHANDLE handle); @@ -3817,8 +3819,10 @@ void Osiris_OMMS_Detach(OMMSHANDLE handle) { // Only has affect if you are attached to the memory. Memory will _ONLY_ be deleted when the // following conditions are meant for the shared memory block: // 1) The reference count for the global memory is at 0 (OMMS_Attach() adds to reference count, OMMS_Detach() -//subtracts). 2) OMMS_Free() has been called for the block of global memory. The conditions can happen in any order, but -//as soon as both are satisfied, the memory becomes deleted and any pointer returned by OMMS_Attach() becomes invalid. +// subtracts). 2) OMMS_Free() has been called for the block of global memory. The conditions can happen in any order, +// but +// as soon as both are satisfied, the memory becomes deleted and any pointer returned by OMMS_Attach() becomes +// invalid. // // handle : the value returned by OMMS_Malloc() void Osiris_OMMS_Free(OMMSHANDLE handle) { diff --git a/Descent3/Player.cpp b/Descent3/Player.cpp index e872669e..1000a9d3 100644 --- a/Descent3/Player.cpp +++ b/Descent3/Player.cpp @@ -3225,7 +3225,7 @@ void PlayerShipSpewPartSub(object *obj, bsp_info *submodel, float magnitude) { rand_vec = (-rand_vec) * (magnitude * 25.0f); phys_apply_force(obj, &rand_vec); // mprintf((0, "Breakoff fireball size: %f, lifeleft: %f\n", Objects[objnum].size, - //Objects[objnum].lifeleft)); + // Objects[objnum].lifeleft)); } } diff --git a/Descent3/WeaponFire.cpp b/Descent3/WeaponFire.cpp index 371bf990..e0e63b35 100644 --- a/Descent3/WeaponFire.cpp +++ b/Descent3/WeaponFire.cpp @@ -1337,7 +1337,7 @@ int CreateAndFireWeapon(vector *pos, vector *dir, object *parent, int weapon_num obj->ctype.laser_info.hit_status = WPC_HIT_WALL; // mprintf((0, "WPC: Hit r%d rw%d w%d (%f,%f,%f)\n", hit_info.hit_room, - //hit_info.hit_face_room[0], hit_info.hit_face[0], XYZ(&hit_info.hit_wallnorm[0]))); + // hit_info.hit_face_room[0], hit_info.hit_face[0], XYZ(&hit_info.hit_wallnorm[0]))); } else { obj->ctype.laser_info.hit_status = WPC_NO_COLLISIONS; // mprintf((0, "WPC: No collisions\n")); diff --git a/Descent3/aipath.cpp b/Descent3/aipath.cpp index 952505bb..5dcb329e 100644 --- a/Descent3/aipath.cpp +++ b/Descent3/aipath.cpp @@ -800,7 +800,7 @@ void AIGenerateAltBOAPath(vector *start_pos, vector *end_pos, ai_path_info *aip, } // if(ROOMNUM_OUTSIDE(next_room) && ROOMNUM_OUTSIDE(*end_room) && (TERRAIN_REGION(next_room) == -//TERRAIN_REGION(*end_room) || TERRAIN_REGION(*end_room) == 0 || TERRAIN_REGION(next_room) == 0)) +// TERRAIN_REGION(*end_room) || TERRAIN_REGION(*end_room) == 0 || TERRAIN_REGION(next_room) == 0)) // { // next_room = *end_room; // } @@ -1006,7 +1006,7 @@ bool AIPathAllocPath(object *obj, ai_frame *ai_info, void *goal_ptr, int *start_ AIPathFreePath(aip); // if(ai_info->awareness <= AWARE_NONE && !(ai_info->flags & AIF_PERSISTANT)) // chrishack -- scalar max_nodes in - //path by awareness return false; + // path by awareness return false; aip->goal_index = (goal *)goal_ptr - ai_info->goals; aip->goal_uid = ((goal *)goal_ptr)->goal_uid; diff --git a/Descent3/cockpit.cpp b/Descent3/cockpit.cpp index 4b7bd7f9..2bed457e 100644 --- a/Descent3/cockpit.cpp +++ b/Descent3/cockpit.cpp @@ -535,7 +535,7 @@ float KeyframeAnimateCockpit() { newkeyframe = Cockpit_info.this_keyframe + (Cockpit_info.next_keyframe - Cockpit_info.this_keyframe) * (Cockpit_info.frame_time / COCKPIT_ANIM_TIME); // mprintf((0, "this=%.1f next=%.1f ft=%.1f\n", Cockpit_info.this_keyframe, Cockpit_info.next_keyframe, - //Cockpit_info.frame_time)); going up in keyframes + // Cockpit_info.frame_time)); going up in keyframes if (Cockpit_info.this_keyframe < Cockpit_info.next_keyframe) { if (newkeyframe >= Cockpit_info.next_keyframe) { Cockpit_info.frame_time = 0.0f; diff --git a/Descent3/config.cpp b/Descent3/config.cpp index 2e65d2ea..8f8486ac 100644 --- a/Descent3/config.cpp +++ b/Descent3/config.cpp @@ -1077,8 +1077,8 @@ struct toggles_menu { sheet->AddRadioButton(TXT_LEFT); //@@ sheet->AddRadioButton(TXT_CENTER); sheet->AddRadioButton(TXT_RIGHT); - //@@ *missile_view = (Missile_camera_window==SVW_LEFT) ? 1 : (Missile_camera_window==SVW_CENTER) ? 2 : - //(Missile_camera_window==SVW_RIGHT) ? 3 : 0; + //@@ *missile_view = (Missile_camera_window==SVW_LEFT) ? 1 : (Missile_camera_window==SVW_CENTER) ? 2 + //: (Missile_camera_window==SVW_RIGHT) ? 3 : 0; *missile_view = (Missile_camera_window == SVW_LEFT) ? 1 : (Missile_camera_window == SVW_RIGHT) ? 2 : 0; #ifndef MACINTOSH @@ -1124,8 +1124,8 @@ struct toggles_menu { Default_player_room_leveling = *mine_autolevel; iTemp = (*missile_view); - //@@ Missile_camera_window = (iTemp==1) ? SVW_LEFT : (iTemp==2) ? SVW_CENTER : (iTemp==3) ? SVW_RIGHT : - //-1; + //@@ Missile_camera_window = (iTemp==1) ? SVW_LEFT : (iTemp==2) ? SVW_CENTER : (iTemp==3) ? SVW_RIGHT + //: -1; Missile_camera_window = (iTemp == 1) ? SVW_LEFT : (iTemp == 2) ? SVW_RIGHT : -1; #ifndef MACINTOSH Current_pilot.read_controller = (*joy_enabled) ? READF_JOY : 0; diff --git a/Descent3/credits.cpp b/Descent3/credits.cpp index 5c9a93d0..faf598c2 100644 --- a/Descent3/credits.cpp +++ b/Descent3/credits.cpp @@ -407,8 +407,8 @@ void Credits_Display(void) { // end the music. D3MusicStop(); ddio_KeyFlush(); -// ddio_MouseReset(); // -mouse shouldn't be reset. ui system gets hosed unfortunately -//under NT. +// ddio_MouseReset(); // -mouse shouldn't be reset. ui system gets hosed +//unfortunately under NT. #endif } diff --git a/Descent3/damage.cpp b/Descent3/damage.cpp index 97c0c040..278bfadc 100644 --- a/Descent3/damage.cpp +++ b/Descent3/damage.cpp @@ -1455,9 +1455,10 @@ void FindHitpointUV(float *u, float *v, vector *point, room *rp, int facenum); // Break the specified (glass) face into shards // Parameters: rp, facenum - the face to break. The face must be a portal face. -// hitpnt - the point on the face where the face shatters. If NULL, uses center point of -//face hitvec - the direction in which the thing that's breaking the glass is moving. If NULL, uses the negative of the -//surface normal +// hitpnt - the point on the face where the face shatters. If NULL, uses center point +//of +// face hitvec - the direction in which the thing that's breaking the glass is moving. If +// NULL, uses the negative of the surface normal void BreakGlassFace(room *rp, int facenum, vector *hitpnt, vector *hitvec) { int roomnum; vector t_hitpnt, t_hitvec; diff --git a/Descent3/damage.h b/Descent3/damage.h index 7ec1a61c..54a2c9e0 100644 --- a/Descent3/damage.h +++ b/Descent3/damage.h @@ -135,9 +135,10 @@ void UnshakePlayer(); // Break the specified (glass) face into shards // Parameters: rp, facenum - the face to break -// hitpnt - the point on the face where the face shatters. If NULL, uses center point of -//face hitvec - the direction in which the thing that's breaking the glass is moving. If NULL, uses the negative of the -//surface normal +// hitpnt - the point on the face where the face shatters. If NULL, uses center point +//of +// face hitvec - the direction in which the thing that's breaking the glass is moving. If +// NULL, uses the negative of the surface normal void BreakGlassFace(room *rp, int facenum, vector *hitpnt = NULL, vector *hitvec = NULL); #endif \ No newline at end of file diff --git a/Descent3/fireball.cpp b/Descent3/fireball.cpp index 0a5f3501..01736ab8 100644 --- a/Descent3/fireball.cpp +++ b/Descent3/fireball.cpp @@ -1805,9 +1805,9 @@ void DoConcussiveForce(object *explode_obj_ptr, int parent_handle, float player_ // blow up, blowing up all the children. So I remove it. MK, 09/11/94 // if ( (hit_obj_ptr!=explode_obj_ptr) && !(hit_obj_ptr->flags&OF_DEAD) && //((hit_obj_ptr->type==OBJ_WEAPON /*&& (hit_obj_ptr->id==PROXIMITY_ID || hit_obj_ptr->id==SUPERPROX_ID || - //hit_obj_ptr->id==PMINE_ID)*/) || (hit_obj_ptr->type == OBJ_CNTRLCEN) || (hit_obj_ptr->type==OBJ_PLAYER) || + // hit_obj_ptr->id==PMINE_ID)*/) || (hit_obj_ptr->type == OBJ_CNTRLCEN) || (hit_obj_ptr->type==OBJ_PLAYER) || //((hit_obj_ptr->type==OBJ_ROBOT) && ((Objects[parent].type != OBJ_ROBOT) || (Objects[parent].id != - //hit_obj_ptr->id))))) { + // hit_obj_ptr->id))))) { hit_obj_ptr = &Objects[i]; // Check for types that get concussive force if (!((hit_obj_ptr->type == OBJ_WEAPON) || (hit_obj_ptr->type == OBJ_ROBOT) || diff --git a/Descent3/game.h b/Descent3/game.h index 7b8c9cd9..8b105a9a 100644 --- a/Descent3/game.h +++ b/Descent3/game.h @@ -256,8 +256,8 @@ extern renderer_preferred_state Render_preferred_state; extern int Render_preferred_bitdepth; #define GM_SINGLE 1 // Single player game. -//#define GM_SERIAL 2 // You are in serial mode (Jason doesn't like -//this.) +//#define GM_SERIAL 2 // You are in serial mode (Jason doesn't +//like this.) #define GM_NETWORK 4 // You are in network mode #define GM_MODEM 32 // You are in a modem (serial) game diff --git a/Descent3/gamesequence.cpp b/Descent3/gamesequence.cpp index df205511..bd436348 100644 --- a/Descent3/gamesequence.cpp +++ b/Descent3/gamesequence.cpp @@ -1920,8 +1920,8 @@ void EndLevel(int state) { // report the information to the pilot's mission data CurrentPilotUpdateMissionStatus(); - // Sound_system.StopAllSounds(); -- moved to below because bug was reported that sounds were playing in - //performance screen + // Sound_system.StopAllSounds(); -- moved to below because bug was reported that sounds were playing + //in performance screen // save our shields (in case this call is due to starting a new level // in InitPlayerNewLevel, we'll determine if we should restore them diff --git a/Descent3/help.cpp b/Descent3/help.cpp index 1712ec56..b57285ba 100644 --- a/Descent3/help.cpp +++ b/Descent3/help.cpp @@ -225,7 +225,7 @@ void HelpDisplay(void) { // quit_hot.Create(&help_wnd, UID_CANCEL, 0, &UITextItem(TXT_PRESSESCRET, UICOL_HOTSPOT_LO,UIALPHA_HOTSPOT_LO), // &UITextItem(TXT_PRESSESCRET,UICOL_HOTSPOT_HI,UIALPHA_HOTSPOT_HI), // HELP_X_KEY_POS, WND_HELP_H - OKCANCEL_YOFFSET, - //0,0,UIF_FIT|UIF_CENTER); + // 0,0,UIF_FIT|UIF_CENTER); help_wnd.Open(); while (!exit_menu) { diff --git a/Descent3/hotspotmap.cpp b/Descent3/hotspotmap.cpp index 67ce2679..14a0b668 100644 --- a/Descent3/hotspotmap.cpp +++ b/Descent3/hotspotmap.cpp @@ -909,7 +909,7 @@ void DisplayHotSpots(hotspotmap_t *hsmap, windowmap_t *wndmap) { //@@ { //@@ Game_viewport->hline(GR_RGB(0,0,255),curr_hotspot->x[scanline_count].start, //@@ - //curr_hotspot->x[scanline_count].end,curr_y+scanline_count); + // curr_hotspot->x[scanline_count].end,curr_y+scanline_count); //@@ } //@@ } //@@ @@ -919,24 +919,24 @@ void DisplayHotSpots(hotspotmap_t *hsmap, windowmap_t *wndmap) { //@@ { //@@ Game_viewport->fillrect(GR_RGB(255,0,0), wndmap->wm[count].x,wndmap->wm[count].y, //@@ - //wndmap->wm[count].x+wndmap->wm[count].width-1,wndmap->wm[count].y+wndmap->wm[count].height-1); + // wndmap->wm[count].x+wndmap->wm[count].width-1,wndmap->wm[count].y+wndmap->wm[count].height-1); //@@ //if there is a writeable area, display it //@@ if(wndmap->wm[count].t_top_y!=-1) //@@ { //@@ Game_viewport->fillrect(GR_RGB(128,128,128), - //wndmap->wm[count].l_start_x,wndmap->wm[count].t_top_y, + // wndmap->wm[count].l_start_x,wndmap->wm[count].t_top_y, //@@ wndmap->wm[count].l_end_x,wndmap->wm[count].t_bottom_y); //@@ Game_viewport->fillrect(GR_RGB(128,128,128), - //wndmap->wm[count].r_start_x,wndmap->wm[count].t_top_y, + // wndmap->wm[count].r_start_x,wndmap->wm[count].t_top_y, //@@ wndmap->wm[count].r_end_x,wndmap->wm[count].t_bottom_y); //@@ } //@@ if(wndmap->wm[count].b_top_y!=-1) //@@ { //@@ Game_viewport->fillrect(GR_RGB(128,128,128), - //wndmap->wm[count].l_start_x,wndmap->wm[count].b_top_y, + // wndmap->wm[count].l_start_x,wndmap->wm[count].b_top_y, //@@ wndmap->wm[count].l_end_x,wndmap->wm[count].b_bottom_y); //@@ Game_viewport->fillrect(GR_RGB(128,128,128), - //wndmap->wm[count].r_start_x,wndmap->wm[count].b_top_y, + // wndmap->wm[count].r_start_x,wndmap->wm[count].b_top_y, //@@ wndmap->wm[count].r_end_x,wndmap->wm[count].b_bottom_y); //@@ } //@@ diff --git a/Descent3/init.cpp b/Descent3/init.cpp index 000d82c9..221cd116 100644 --- a/Descent3/init.cpp +++ b/Descent3/init.cpp @@ -1934,7 +1934,7 @@ void UpdateInitMessage(float amount) { return; InitMessage(Init_messagebar_text, (amount * Init_messagebar_portion) + Init_messagebar_offset); // mprintf((0, "amt=%.2f, portion=%.2f offs=%.2f, prog=%.2f\n", amount, Init_messagebar_portion, - //Init_messagebar_offset, (amount*Init_messagebar_portion)+Init_messagebar_offset)); + // Init_messagebar_offset, (amount*Init_messagebar_portion)+Init_messagebar_offset)); } void InitMessage(char *c, float progress) { diff --git a/Descent3/loadstate.cpp b/Descent3/loadstate.cpp index 5bb6245f..2f2df20e 100644 --- a/Descent3/loadstate.cpp +++ b/Descent3/loadstate.cpp @@ -1702,8 +1702,8 @@ int LGSSnapshot(CFILE *fp) { //@@ PageInVClip (Weapons[op->id].fire_image_handle); //@@ break; //@@ } -//@@ case RT_POLYOBJ: // be sure to use translated handles for polyobjs and -//textures +//@@ case RT_POLYOBJ: // be sure to use translated handles for polyobjs +//and textures //@@ gs_ReadShort(fp, sindex); //@@ new_model = (sindex > -1) ? gs_Xlates->model_handles[sindex] : -1; //@@ if (new_model != pobji->model_num) diff --git a/Descent3/matcen.cpp b/Descent3/matcen.cpp index 3f06994c..84e5607f 100644 --- a/Descent3/matcen.cpp +++ b/Descent3/matcen.cpp @@ -1437,8 +1437,8 @@ void matcen::DoRenderFrame() { // Useful status members: // MSTAT_CREATE_OBJ_FRAME - // DAJ FIXES YET ANOTHER BUG WHERE THE ARRAY INDEX IS NOT CHECKED BEFORE USE (m_prod_type[m_cached_prod_index] == - // -1) + // DAJ FIXES YET ANOTHER BUG WHERE THE ARRAY INDEX IS NOT CHECKED BEFORE USE (m_prod_type[m_cached_prod_index] + // == -1) if (!(m_cached_prod_index >= 0 && m_cached_prod_index < m_num_prod_types && m_prod_type[m_cached_prod_index] >= 0 && m_prod_type[m_cached_prod_index] <= MAX_OBJECT_TYPES && Object_info[m_prod_type[m_cached_prod_index]].type != OBJ_NONE)) diff --git a/Descent3/newui.h b/Descent3/newui.h index f68325b6..d8b4e7ae 100644 --- a/Descent3/newui.h +++ b/Descent3/newui.h @@ -335,7 +335,8 @@ bool DoFileDialog(const char *title, const char *search_path, const char *ext, c // save_dialog = is this dialog being used to save file, or load a file. If save, than pass true // path = on entry is the initial path to start in (must be set...set to 0 length string to go to root directory) // on exit it is the absolute path to selected file on return (if return is true) must be at least -//_MAX_PATH in size title = Title of the dialog wildc = semicolon seperated list of wildcards ("*.txt;*.doc;*.exe") +//_MAX_PATH in size title = Title of the dialog wildc = semicolon seperated list of wildcards +//("*.txt;*.doc;*.exe") bool DoPathFileDialog(bool save_dialog, char *path, char *title, char *wildc, int flags); ////////////////////////////////////////////////////////////////////////////// diff --git a/Descent3/newui_filedlg.cpp b/Descent3/newui_filedlg.cpp index 289e1949..0585385c 100644 --- a/Descent3/newui_filedlg.cpp +++ b/Descent3/newui_filedlg.cpp @@ -198,8 +198,8 @@ void FileSelectCallback(int index) { // Displays a file/directory dialog box // path - Initial path, will contain the chosen file/path on exit with true, must be at least _MAX_PATH -//in size title - Title of the dialog wildc - semicolon (;) seperated list of wildcards to be shown flags - see -//header PFDF_ for flags +// in size title - Title of the dialog wildc - semicolon (;) seperated list of wildcards to +// be shown flags - see header PFDF_ for flags bool DoPathFileDialog(bool save_dialog, char *path, char *title, char *wildc, int flags) { #define HS_CANCEL 0 #define HS_OK 1 diff --git a/Descent3/object_external_struct.h b/Descent3/object_external_struct.h index 574e8e1c..43028205 100644 --- a/Descent3/object_external_struct.h +++ b/Descent3/object_external_struct.h @@ -322,14 +322,14 @@ typedef struct physics_info { int num_bounces; // Number of bounces before exploding (PHYSICS_UNLIMITED_BOUNCE is for unlimited bouncing) float coeff_restitution; // What percent of velocity is kept after a bounce - float mass; // The mass of this object -- what about moving into - // type info + float mass; // The mass of this object -- what about moving + // into type info float drag; // How fast this slows down -- what about moving into type info float rotdrag; // How much resistance to a change in spin rate -- what about moving into type info union { - float full_thrust; // Maximum thrust magnitude -- what about moving into - // type info + float full_thrust; // Maximum thrust magnitude -- what about moving + // into type info float max_velocity; }; union { @@ -340,8 +340,8 @@ typedef struct physics_info { float turnroll_ratio; // How much roll for a given turning rate -- what about moving into type info float wiggle_amplitude; // The amplitude of an object's wiggle -- what about moving into type info - float wiggles_per_sec; // How fast something wiggles -- what about moving into type - // info + float wiggles_per_sec; // How fast something wiggles -- what about moving into + // type info vector dest_pos; // destination position for interpolating velocity (for multiplayer only) diff --git a/Descent3/osiris_dll.h b/Descent3/osiris_dll.h index 3f8a6537..f3ef58f2 100644 --- a/Descent3/osiris_dll.h +++ b/Descent3/osiris_dll.h @@ -318,7 +318,7 @@ void Osiris_DisableCreateEvents(void); // Purpose: // Enables any events involved when an object is created. This is to be used for // Loading games/viewing demos, as so not to re-initialize good data. (call when done with -//Osiris_DisableCreateEvents()) +// Osiris_DisableCreateEvents()) void Osiris_EnableCreateEvents(void); #endif \ No newline at end of file diff --git a/Descent3/pilot.cpp b/Descent3/pilot.cpp index ad1a08d9..566586c1 100644 --- a/Descent3/pilot.cpp +++ b/Descent3/pilot.cpp @@ -2269,8 +2269,8 @@ bool CreateCRCFileName(const char *src, char *base, char *newfilename) { // FindAllFiles // // Retrieves the files in the current directory that match the pattern given. Call FindAllFilesSize() to -//determine how much memory will be needed for the buffer. pattern = wildcard pattern to use to match list -//= buffer of memory that will be filled in with the filenames (each seperated by a \0) +// determine how much memory will be needed for the buffer. pattern = wildcard pattern to use to match +// list = buffer of memory that will be filled in with the filenames (each seperated by a \0) // size = size of memory allocated for list parm // filecount = filled in with the number of files it found int FindAllFiles(const char *pattern, char *list, int size, int *filecount) { diff --git a/Descent3/render.cpp b/Descent3/render.cpp index 9775f5f3..217c74d4 100644 --- a/Descent3/render.cpp +++ b/Descent3/render.cpp @@ -222,8 +222,8 @@ inline bool FaceIsRenderable(room *rp, face *fp) { // Determines if a face draws with alpha blending // Parameters: fp - pointer to the face in question // bm_handle - the handle for the bitmap for this frame, or -1 if don't care about -//transparence Returns: bitmask describing the alpha blending for the face the return bits are the ATF_ flags in -//renderer.h +// transparence Returns: bitmask describing the alpha blending for the face the return +// bits are the ATF_ flags in renderer.h inline int GetFaceAlpha(face *fp, int bm_handle) { int ret = AT_ALWAYS; if (GameTextures[fp->tmap].flags & TF_SATURATE) { diff --git a/Descent3/winmain.cpp b/Descent3/winmain.cpp index 24f274ea..44134c63 100644 --- a/Descent3/winmain.cpp +++ b/Descent3/winmain.cpp @@ -362,7 +362,7 @@ bool SupportsCPUID() { _asm { pushad __emit 0x0f // CPUID - __emit 0xa2 // CPUID + __emit 0xa2 // CPUID popad } } __except (1) { @@ -511,7 +511,7 @@ void getcpudata(cpuinfo *info) { and al,240; // mask model shr al,4; mov model,al; - and cl,15; // mask mask revision + and cl,15; // mask mask revision mov mask,cl; mov capability,edx; diff --git a/cfile/CFILE.cpp b/cfile/CFILE.cpp index 4bb50c5d..15fc3fca 100644 --- a/cfile/CFILE.cpp +++ b/cfile/CFILE.cpp @@ -178,8 +178,10 @@ void cf_Close() { } // Specify a directory to look in for files // Parameters: path - the directory path. Can be relative to the current cur (the full path will be stored) -// ext - if NULL, look in this dir for all files. If non-null, it is a NULL-terminated -//list of file extensions, & the dir will only be searched for files with a matching extension Returns: true if +// ext - if NULL, look in this dir for all files. If non-null, it is a +//NULL-terminated +// list of file extensions, & the dir will only be searched for files with a +// matching extension Returns: true if // directory added, else false int cf_SetSearchPath(const char *path, char *ext, ...) { if (strlen(path) >= _MAX_PATH) diff --git a/dd_lnxsound/mixer.cpp b/dd_lnxsound/mixer.cpp index f8c60491..bf4f3c3d 100644 --- a/dd_lnxsound/mixer.cpp +++ b/dd_lnxsound/mixer.cpp @@ -409,11 +409,11 @@ void software_mixer::StreamMixer(char *ptr, int len) { cur_buf->play_info->m_stream_data = (*cur_buf->play_info->m_stream_cback)( cur_buf->play_info->user_data, cur_buf->play_info->m_stream_handle, &cur_buf->play_info->m_stream_size); // cur_buf->s->current_position = (char - //*)cur_buf->play_info->m_stream_data; mprintf((0, "%x %d\n", cur_buf->play_info->m_stream_data, - //cur_buf->play_info->m_stream_size)); + //*)cur_buf->play_info->m_stream_data; mprintf((0, "%x %d\n", + //cur_buf->play_info->m_stream_data, cur_buf->play_info->m_stream_size)); ASSERT(!(cur_buf->play_info->m_stream_data && cur_buf->play_info->m_stream_size <= 0)); - // mprintf((0, "Data %X, length %d\n", cur_buf->play_info->m_stream_data, - //cur_buf->play_info->m_stream_size)); + // mprintf((0, "Data %X, length %d\n", + //cur_buf->play_info->m_stream_data, cur_buf->play_info->m_stream_size)); if (cur_buf->play_info->m_stream_data) { switch (cur_buf->play_info->m_stream_format) { diff --git a/dd_sndlib/Ds3dlib.cpp b/dd_sndlib/Ds3dlib.cpp index 52af1911..5eb6d15b 100644 --- a/dd_sndlib/Ds3dlib.cpp +++ b/dd_sndlib/Ds3dlib.cpp @@ -480,7 +480,7 @@ inline void sb_adjust_properties_3d(sound_buffer_info *sb, float f_volume, pos_s f_volume = 1.0f; A3D_SetSourceVolume(sb->m_snd_obj, f_volume); // A3D_SetMinMaxDistance(sb->m_snd_obj, Sounds[sb->m_sound_index].min_distance, - //Sounds[sb->m_sound_index].max_distance); + // Sounds[sb->m_sound_index].max_distance); A3D_SetMinMaxDistance(sb->m_snd_obj, 30.0f, Sounds[sb->m_sound_index].max_distance); // A3D_SetSourceCone(sb->m_snd_obj, x,y,z); A3D_SetSourceOrientation(sb->m_snd_obj, &pos->orient->fvec, &pos->orient->uvec); @@ -1033,11 +1033,11 @@ void StreamMixer(char *ptr, int len) { cur_buf->play_info->m_stream_data = (*cur_buf->play_info->m_stream_cback)( cur_buf->play_info->user_data, cur_buf->play_info->m_stream_handle, &cur_buf->play_info->m_stream_size); // cur_buf->s->current_position = (char - //*)cur_buf->play_info->m_stream_data; mprintf((0, "%x %d\n", cur_buf->play_info->m_stream_data, - //cur_buf->play_info->m_stream_size)); + //*)cur_buf->play_info->m_stream_data; mprintf((0, "%x %d\n", + //cur_buf->play_info->m_stream_data, cur_buf->play_info->m_stream_size)); ASSERT(!(cur_buf->play_info->m_stream_data && cur_buf->play_info->m_stream_size <= 0)); - // mprintf((0, "Data %X, length %d\n", cur_buf->play_info->m_stream_data, - //cur_buf->play_info->m_stream_size)); + // mprintf((0, "Data %X, length %d\n", + //cur_buf->play_info->m_stream_data, cur_buf->play_info->m_stream_size)); if (cur_buf->play_info->m_stream_data) { switch (cur_buf->play_info->m_stream_format) { @@ -2116,7 +2116,7 @@ short win_llsSystem::FindFreeSoundSlot(float volume, int priority) sb = &m_sound_mixer.m_sound_cache[throw_out_slot]; win_llsSystem::StopSound(sb->m_unique_id, SKT_HOLD_UNTIL_STOP); // mprintf((0, "DDSNDLIB: Replace sound (p:%d) with sound (p:%d) in slot %d\n", sb->play_info->priority, - //priority, throw_out_slot)); + // priority, throw_out_slot)); return throw_out_slot; } } @@ -3070,7 +3070,7 @@ int win_llsSystem::PlaySound3d(play_information *play_info, int sound_index, pos } // mprintf((0, "SL Play sound on slot %d, TP = %d UI = %X\n", sound_slot, TotalSoundsPlayed, - //m_sound_mixer.m_sound_cache[sound_slot].m_unique_id)); + // m_sound_mixer.m_sound_cache[sound_slot].m_unique_id)); } m_sound_mixer.m_cur_sounds_played++; diff --git a/dd_sndlib/ddsoundload.cpp b/dd_sndlib/ddsoundload.cpp index c4d54a37..80bf1795 100644 --- a/dd_sndlib/ddsoundload.cpp +++ b/dd_sndlib/ddsoundload.cpp @@ -401,7 +401,7 @@ char SoundLoadWaveFile(char *filename, float percent_volume, int sound_file_inde SoundFiles[sound_file_index].np_sample_length = cksize / 2; // SoundFiles[sound_file_index].sample_16bit = (short *) - //mem_malloc(2*cksize); + // mem_malloc(2*cksize); SoundFiles[sound_file_index].sample_16bit = (short *)mem_malloc(cksize); cf_ReadBytes((unsigned char *)SoundFiles[sound_file_index].sample_16bit, cksize, cfptr); diff --git a/dd_sndlib/dsound3d.cpp b/dd_sndlib/dsound3d.cpp index 0780c7a2..4e2f6f1c 100644 --- a/dd_sndlib/dsound3d.cpp +++ b/dd_sndlib/dsound3d.cpp @@ -385,8 +385,8 @@ bool sb_stream_element_init(sound_buffer_info *sb, char *sample_ptr, int sound_l } } else { - Int3(); // unimplemented for normal - DirectSound CloseHandle(sb->s->hEvent); sb->s->hEvent = NULL; + Int3(); // unimplemented for + normal DirectSound CloseHandle(sb->s->hEvent); sb->s->hEvent = NULL; } */ } diff --git a/ddio_lnx/lnxcdrom.cpp b/ddio_lnx/lnxcdrom.cpp index 9ba58c8a..be11279e 100644 --- a/ddio_lnx/lnxcdrom.cpp +++ b/ddio_lnx/lnxcdrom.cpp @@ -717,7 +717,7 @@ void system_cdroms::QueryDefaultDevice(void) { } #if 0 // rcg10052000 BAD! BADBADBAD! - // see if there's a default dir for mounting this thing. + // see if there's a default dir for mounting this thing. if (checkDevMount(device, "/etc/fstab", m_MountedDir) == false) { // otherwise, we'll make a mountpoint and mount it diff --git a/ddio_mac/macController.cpp b/ddio_mac/macController.cpp index ee8fd233..76cfeeb0 100644 --- a/ddio_mac/macController.cpp +++ b/ddio_mac/macController.cpp @@ -592,7 +592,7 @@ float gameMacController::get_axis_value(sbyte controller, ubyte axis, ct_format break; } // mprintf((2, "x %d y %d z %d p %d h %d r %d\n", - //is_joy[kNeed_MoveX],is_joy[kNeed_MoveY],is_joy[kNeed_MoveZ],is_joy[kNeed_Pitch],is_joy[kNeed_Yaw],is_joy[kNeed_Roll])); + // is_joy[kNeed_MoveX],is_joy[kNeed_MoveY],is_joy[kNeed_MoveZ],is_joy[kNeed_Pitch],is_joy[kNeed_Yaw],is_joy[kNeed_Roll])); return axisval; } diff --git a/ddio_mac/macjoy.cpp b/ddio_mac/macjoy.cpp index 3490fb5f..52d19301 100644 --- a/ddio_mac/macjoy.cpp +++ b/ddio_mac/macjoy.cpp @@ -153,8 +153,8 @@ bool joy_InitRemoteStick(tJoystick joy, char *server_adr, tJoystickRecord *stick // start packet read thread. //@@ Thread_running[(int)joy] = false; //@@ unsigned thread_id; - //@@ unsigned long thread_handle = _beginthreadex(NULL, 0, joy_ReadRemotePacket, &Joysticks[(int)joy], 1, - &thread_id); + //@@ unsigned long thread_handle = _beginthreadex(NULL, 0, joy_ReadRemotePacket, &Joysticks[(int)joy], + 1, &thread_id); //@@ if (thread_handle == 0) { //@@ Error("Remote joystick thread creation failed."); //@@ } diff --git a/ddio_win/winkey.cpp b/ddio_win/winkey.cpp index 8111ef58..3a29843d 100644 --- a/ddio_win/winkey.cpp +++ b/ddio_win/winkey.cpp @@ -179,11 +179,11 @@ static struct tWinKeyData { HANDLE evtnotify; // notify event HHOOK winhook; // windows hook unsigned long thread; // thread id - // osMutex keyframe_mutex; // mutex between internal key frame and key - //thread. - bool nextframe; // used for mutexing between keyframe and thread. - bool acquired; // device acquired? - bool thread_active; // used in thread. + // osMutex keyframe_mutex; // mutex between + //internal key frame and key thread. + bool nextframe; // used for mutexing between keyframe and thread. + bool acquired; // device acquired? + bool thread_active; // used in thread. bool suspended; } WKD = {NULL, NULL, NULL, 0xffffffff, false, false, false, true}; diff --git a/grtext/grfont.cpp b/grtext/grfont.cpp index 5dee7e29..5a9222b1 100644 --- a/grtext/grfont.cpp +++ b/grtext/grfont.cpp @@ -289,7 +289,7 @@ int grfont_Load(char *fname) { // mprintf((0, "%s font.\n", fname)); // mprintf((0, " ::::::", fnt.height, fnt.min_ascii, fnt.max_ascii, - //fnt.baseline)); + // fnt.baseline)); num_char = fnt.max_ascii - fnt.min_ascii + 1; if (fnt.max_ascii < 'a') { @@ -739,12 +739,11 @@ int grfont_BltChar(int font, tCharBlt *cbi) { ft->ch_wf[cbi->ch], ft->ch_hf[cbi->ch]); return (cbi->x + (int)(cbi->sw * cbi->dsw)); //@@ rend_DrawFontCharacter (ft->bmps[ft->ch_bmp[cbi->ch]], cbi->x,cbi->y, - //@@ cbi->x+ft->ch_w[cbi->ch], - //cbi->y+ft->ch_h[cbi->ch], + //@@ cbi->x+ft->ch_w[cbi->ch], cbi->y+ft->ch_h[cbi->ch], //@@ ft->ch_uf[cbi->ch], - //ft->ch_vf[cbi->ch], + // ft->ch_vf[cbi->ch], //@@ ft->ch_wf[cbi->ch], - //ft->ch_hf[cbi->ch]); + // ft->ch_hf[cbi->ch]); //@@ return (cbi->x + ft->ch_w[cbi->ch] - 1); } else { rend_DrawFontCharacter( diff --git a/lib/networking.h b/lib/networking.h index 6e48d60d..e8f01a4e 100644 --- a/lib/networking.h +++ b/lib/networking.h @@ -484,8 +484,8 @@ int nw_psnet_buffer_get_next_by_dpid(ubyte *data, int *length, unsigned long dpi // This is all the reliable UDP stuff... #define MAXNETBUFFERS \ - 150 // Maximum network buffers (For between network and upper level functions, which is - // required in case of out of order packets + 150 // Maximum network buffers (For between network and upper level functions, which is + // required in case of out of order packets #define NETRETRYTIME .75 // Time after sending before we resend #define MIN_NET_RETRYTIME .2 #define NETTIMEOUT 300 // Time after receiving the last packet before we drop that user diff --git a/lib/polymodel_external.h b/lib/polymodel_external.h index c3e4543d..57460587 100644 --- a/lib/polymodel_external.h +++ b/lib/polymodel_external.h @@ -144,7 +144,7 @@ typedef struct bsp_info { vector pnt; // point for sep plane vector geometric_center; // geometric center of this subobject. In the same Frame Of // Reference as all other vertices in this submodel. (Relative to pivot point) - float rad; // radius for each submodel + float rad; // radius for each submodel vector *verts; // vertices for the submodel (NEWSTYLE) vector *vertnorms; diff --git a/lib/texture.h b/lib/texture.h index 339674dc..661fb25d 100644 --- a/lib/texture.h +++ b/lib/texture.h @@ -96,8 +96,8 @@ typedef struct { } texs_texpoint; // For the following enum table: LIN=Linear, PER=Perspective, NON=No Transparency, LIT = Shaded, -// COLORED=Colored lighting, TRANS=Transparency ALPHA=Alpha -//renderer +// COLORED=Colored lighting, TRANS=Transparency +//ALPHA=Alpha renderer #define MAX_RENDER_TYPES 15 diff --git a/lib/ui.h b/lib/ui.h index 1d2c737d..b862aabd 100644 --- a/lib/ui.h +++ b/lib/ui.h @@ -590,7 +590,7 @@ protected: // typically this function is called by a child class when we want // to tell the caller that this gadget was selected for something. // virtual void OnSelect(); // override: behavior when gadget is - //selected. + // selected. }; // check boxes use most of the behavior of default buttons. diff --git a/lib/win/DirectX/d3dtypes.h b/lib/win/DirectX/d3dtypes.h index dc15febc..aa70cd8b 100644 --- a/lib/win/DirectX/d3dtypes.h +++ b/lib/win/DirectX/d3dtypes.h @@ -1139,10 +1139,10 @@ typedef enum _D3DTEXTUREOP { // = Arg1 + (1-Arg1)*Arg2 // Linear alpha blend: Arg1*(Alpha) + Arg2*(1-Alpha) - D3DTOP_BLENDDIFFUSEALPHA = 12, // iterated alpha - D3DTOP_BLENDTEXTUREALPHA = 13, // texture alpha - D3DTOP_BLENDFACTORALPHA = 14, // alpha from D3DRENDERSTATE_TEXTUREFACTOR - // Linear alpha blend with pre-multiplied arg1 input: Arg1 + Arg2*(1-Alpha) + D3DTOP_BLENDDIFFUSEALPHA = 12, // iterated alpha + D3DTOP_BLENDTEXTUREALPHA = 13, // texture alpha + D3DTOP_BLENDFACTORALPHA = 14, // alpha from D3DRENDERSTATE_TEXTUREFACTOR + // Linear alpha blend with pre-multiplied arg1 input: Arg1 + Arg2*(1-Alpha) D3DTOP_BLENDTEXTUREALPHAPM = 15, // texture alpha D3DTOP_BLENDCURRENTALPHA = 16, // by alpha of current color diff --git a/lib/win/DirectX/ddraw.h b/lib/win/DirectX/ddraw.h index d0ab46d4..fdfc057a 100644 --- a/lib/win/DirectX/ddraw.h +++ b/lib/win/DirectX/ddraw.h @@ -413,13 +413,13 @@ typedef struct _DDCAPS_DX5 { /* 88*/ DWORD dwMinOverlayStretch; // minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 /* 8c*/ DWORD dwMaxOverlayStretch; // maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 /* 90*/ DWORD - dwMinLiveVideoStretch; // minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 + dwMinLiveVideoStretch; // minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 /* 94*/ DWORD - dwMaxLiveVideoStretch; // maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 + dwMaxLiveVideoStretch; // maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 /* 98*/ DWORD - dwMinHwCodecStretch; // minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 + dwMinHwCodecStretch; // minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 /* 9c*/ DWORD - dwMaxHwCodecStretch; // maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 + dwMaxHwCodecStretch; // maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 /* a0*/ DWORD dwReserved1; // reserved /* a4*/ DWORD dwReserved2; // reserved /* a8*/ DWORD dwReserved3; // reserved @@ -478,13 +478,13 @@ typedef struct _DDCAPS_DX6 { /* 88*/ DWORD dwMinOverlayStretch; // minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 /* 8c*/ DWORD dwMaxOverlayStretch; // maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 /* 90*/ DWORD - dwMinLiveVideoStretch; // minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 + dwMinLiveVideoStretch; // minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 /* 94*/ DWORD - dwMaxLiveVideoStretch; // maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 + dwMaxLiveVideoStretch; // maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 /* 98*/ DWORD - dwMinHwCodecStretch; // minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 + dwMinHwCodecStretch; // minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 /* 9c*/ DWORD - dwMaxHwCodecStretch; // maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 + dwMaxHwCodecStretch; // maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 /* a0*/ DWORD dwReserved1; // reserved /* a4*/ DWORD dwReserved2; // reserved /* a8*/ DWORD dwReserved3; // reserved diff --git a/lnxcontroller/lnxcontroller.cpp b/lnxcontroller/lnxcontroller.cpp index 6261c781..6fe889a9 100644 --- a/lnxcontroller/lnxcontroller.cpp +++ b/lnxcontroller/lnxcontroller.cpp @@ -948,7 +948,8 @@ sbyte lnxgameController::get_button_controller(ubyte btn) { // start from controller 2 because 0, and 1 are reserved for keyboard and mouse for (int i = 2; i < m_NumControls; i++) - //@@ if (((unsigned)btn < m_ControlList[i].buttons) && !(m_ControlList[i].btnmask & mask) && (m_ControlList[i].id + //@@ if (((unsigned)btn < m_ControlList[i].buttons) && !(m_ControlList[i].btnmask & mask) && + //(m_ControlList[i].id //!= CTID_INVALID)) { if (((unsigned)btn < m_ControlList[i].buttons) && (m_ControlList[i].id != CTID_INVALID)) { //@@ m_ControlList[i].btnmask |= mask; diff --git a/model/polymodel.cpp b/model/polymodel.cpp index 4358a16b..920c0ced 100644 --- a/model/polymodel.cpp +++ b/model/polymodel.cpp @@ -1124,7 +1124,7 @@ void SetPolymodelProperties(bsp_info *subobj, char *props) { subobj->flags |= SOF_TURRET; subobj->fov = fov_angle / 720.0f; // 720 = 360 * 2 and we want to make fov the amount we can move in either // direction it has a minimum value of (0.0) to [0.5] - subobj->rps = 1.0 / turret_spr; // convert spr to rps (rotations per second) + subobj->rps = 1.0 / turret_spr; // convert spr to rps (rotations per second) subobj->think_interval = reaction_time; return; diff --git a/module/module.cpp b/module/module.cpp index 119533f1..f6af5311 100644 --- a/module/module.cpp +++ b/module/module.cpp @@ -447,7 +447,7 @@ bool mod_LoadModule(module *handle, char *imodfilename, int flags) { } err = GetDiskFragment(&SLSpec, 0, 0, NULL, 5, &connID, (Ptr *)NULL, NULL); // err = GetDiskFragment(&SLSpec, 0, kCFragGoesToEOF, toolName, kPrivateCFragCopy, &connID, (Ptr*)&myMainAddr, - //errName); + // errName); if (err) { mprintf((2, "could not get disk fragmet %s\n", modfilename)); // Int3();; diff --git a/netgames/ctf/ctf.cpp b/netgames/ctf/ctf.cpp index 9c63738d..16487eb6 100644 --- a/netgames/ctf/ctf.cpp +++ b/netgames/ctf/ctf.cpp @@ -184,9 +184,9 @@ void OnTimerKill(void); // timer callback: on a flag void DisplayWelcomeMessage(int player_num); // displays a welcome message to the player when he joins void SortTeamScores(int *sortedindex, int *scores); // sorts an array of team scores, filling in the sorted index // numbers -void DisplayHUDScores(struct tHUDItem *hitem); // callback when the HUD info is to be drawn -void ReceiveGameState(ubyte *data); // callback when a gamestate packet is received from the server -void SendGameState(int playernum); // called when the server is to send gamestate packet to a client +void DisplayHUDScores(struct tHUDItem *hitem); // callback when the HUD info is to be drawn +void ReceiveGameState(ubyte *data); // callback when a gamestate packet is received from the server +void SendGameState(int playernum); // called when the server is to send gamestate packet to a client void SetColoredBalls( int playernum, bool reset = false); // sets the colored balls around a player (determined by what is in their inventory) @@ -202,7 +202,7 @@ int GetFlagCountForPlayer(int pnum); ubyte GetFlagMaskForPlayer(int pnum); // adds a flag to a player, as a precaution, it will go through all the players and makes sure that no one // has the flag that is being added. If they are adding the flag, than remove that flag from whoever we thought -//had it it will return false if it had to remove a flag from a player +// had it it will return false if it had to remove a flag from a player bool GivePlayerFlag(int pnum, ubyte team); // this function takes a flag away from the player, useful for when he scores, spews, disconnects, or observer modes void LoseFlagForPlayer(int pnum, ubyte team, bool remove_from_inven = true); @@ -2486,7 +2486,7 @@ ubyte GetFlagMaskForPlayer(int pnum) { // adds a flag to a player, as a precaution, it will go through all the players and makes sure that no one // has the flag that is being added. If they are adding the flag, than remove that flag from whoever we thought -//had it it will return false if it had to remove a flag from a player +// had it it will return false if it had to remove a flag from a player bool GivePlayerFlag(int pnum, ubyte team) { // 1st check the player num, make sure it is valid if (!DMFCBase->CheckPlayerNum(pnum)) { diff --git a/netgames/dmfc/dmfcbase.cpp b/netgames/dmfc/dmfcbase.cpp index 198647d2..007293a0 100644 --- a/netgames/dmfc/dmfcbase.cpp +++ b/netgames/dmfc/dmfcbase.cpp @@ -2633,7 +2633,7 @@ void *DMFCBase::GetPlayerRecordData(int pnum) { // DMFCBase::GetPlayerRecord // // Returns a pointer to the player record at the given slot (passed in slot must be in the range -//0<=slot " where pnum is the playernum, and team_name is the name of the -//team +// team void DMFCInputCommand_ChangeTeam(char *input_string) { if (basethis->GetLocalRole() != LR_SERVER) return; diff --git a/netgames/dmfc/dmfcinputcommands.h b/netgames/dmfc/dmfcinputcommands.h index 2e06e744..d22faaca 100644 --- a/netgames/dmfc/dmfcinputcommands.h +++ b/netgames/dmfc/dmfcinputcommands.h @@ -70,7 +70,7 @@ void DMFCInputCommand_Team(char *input_string); // handle the server wanting to change the team for a player // Usage: "$changeteam " where pnum is the playernum, and team_name is the name of the -//team +// team void DMFCInputCommand_ChangeTeam(char *input_string); // handle the client requesting playerinfo for a player // Usage: "$playerinfo " where pnum is the playernum diff --git a/netgames/dmfc/dmfcinternal.h b/netgames/dmfc/dmfcinternal.h index 5da37b28..ff0a9e5c 100644 --- a/netgames/dmfc/dmfcinternal.h +++ b/netgames/dmfc/dmfcinternal.h @@ -1451,7 +1451,7 @@ public: // DMFCBase::GetPlayerRecord // // Returns a pointer to the player record at the given slot (passed in slot must be in the range - //0<=slot \"" @@ -2501,8 +2501,8 @@ private: #define DTXT_IC_HUDNAME DTXT(110) //"hudnames" #define DTXT_IC_HUDNAMED \ DTXT(111) //"Sets your personal level for the HUD name filter.\nUsage: \"$hudnames \"\nNOTE: You can - //only set your HUD Callsign level up to the level that the server is. So if the server is only allowing up - //to teammates, you won't be able to set to full" + // only set your HUD Callsign level up to the level that the server is. So if the server is only allowing + // up to teammates, you won't be able to set to full" #define DTXT_IC_KICK DTXT(112) //"kick" #define DTXT_IC_KICKD DTXT(113) //"[Server Only]\nKicks a player from the game.\nUsage: \"$kick \"" #define DTXT_IC_KILLMSGFILTER DTXT(114) //"killmsgfilter" @@ -2514,7 +2514,7 @@ private: #define DTXT_IC_OBSERVER DTXT(118) //"observer" #define DTXT_IC_OBSERVERD \ DTXT(119) //"If you pass specify 'on', it puts you into observer mode, else it will return you back to normal - //mode.\nUsage: \"$observer \"" + // mode.\nUsage: \"$observer \"" #define DTXT_IC_PIGGYBACK DTXT(120) //"piggyback" #define DTXT_IC_PIGGYBACKD DTXT(121) //"Puts you into Piggyback Observer mode.\"$piggyback \"" #define DTXT_IC_PLAYERINFO DTXT(122) //"playerinfo" @@ -2526,7 +2526,7 @@ private: #define DTXT_IC_REHASH DTXT(126) //"rehash" #define DTXT_IC_REHASHD \ DTXT(127) //"[Server Only]\nRehashes the hosts.allow and hosts.deny files. First it flushes the old, and reloads - //them.\nUsages: \"$rehash\"" + // them.\nUsages: \"$rehash\"" #define DTXT_IC_REMOVEBAN DTXT(128) //"removeban" #define DTXT_IC_REMOVEBAND \ DTXT(129) //"[Dedicated Server Only]\nRemoves a ban from a player, given the number associated with them from @@ -2724,7 +2724,7 @@ private: #define DTXT_IC_REMOTEADMINLOGOUT DTXT(304) //"remoteadminlogout" #define DTXT_IC_REMOTEADMINLOGOUTD \ DTXT(305) //"[Server Only]\nhandles seeing who is logged in, and allows the server to log them out\nIf no parameter is - //given it lists all the players logged in.\nTo log out a player give the login-id as a parameter\nUsage: + // given it lists all the players logged in.\nTo log out a player give the login-id as a parameter\nUsage: //\"$remoteadminlogout [login-id]\"" #define DTXT_IC_REMOTEADMINPASS DTXT(306) //"remoteadminpass" #define DTXT_IC_REMOTEADMINPASSD \ @@ -2733,8 +2733,8 @@ private: #define DTXT_IC_WAIT DTXT(308) //"wait" #define DTXT_IC_WAITD \ DTXT(309) //"[Dedicated Server Only]\nhandles a request to make all clients wait/or stop waiting. If a time is - //giving, the server will wait that long each level until it lets clients to play.\nUsage: \"$wait \"" + // giving, the server will wait that long each level until it lets clients to play.\nUsage: \"$wait \"" #define GAME_DLL_INTERFACE 9 diff --git a/netgames/hoard/hoardstr.h b/netgames/hoard/hoardstr.h index 1bbd0e79..df4f179c 100644 --- a/netgames/hoard/hoardstr.h +++ b/netgames/hoard/hoardstr.h @@ -54,7 +54,7 @@ char *GetStringFromTable(int index); #define TXT_SAVESTATSB TXT(41) //"Current Level Rankings\r\n" #define TXT_SAVESTATSC \ TXT(42) //"[Rank] [Name] [Score] [Kills] [Deaths] [Suicides] [Highest Goal] [Time In - //Game]" + // Game]" #define TXT_SAVESTATSD TXT(43) //"\r\nIndividual Stats\r\n" #define TXT_TIMEINGAME TXT(44) //"Total Time In Game: %s" #define TXT_SAVESTATSE TXT(45) //"Callsign: Kills: Deaths:" diff --git a/netgames/includes/DMFC.h b/netgames/includes/DMFC.h index 8b75871e..fa5f0682 100644 --- a/netgames/includes/DMFC.h +++ b/netgames/includes/DMFC.h @@ -645,8 +645,8 @@ typedef struct { // being displayed). The stat manager will only display // (*MaxNumberDisplayed) stats (checked each frame). #define DSIF_SHOW_OBSERVERICON \ - 0x00000008 // if this flag is given, the observer mode icon will be - // displayed as the first item in the column + 0x00000008 // if this flag is given, the observer mode icon will be + // displayed as the first item in the column #define DSIF_NOLASTKILLER 0x00000010 // don't display the "Last Killer" #define DSIF_NOLASTVICTIM 0x00000020 // don't display the "Last Victim" #define DSIF_NODETAILEDINFO 0x00000040 // don't display the detailed stats diff --git a/netgames/includes/idmfc.h b/netgames/includes/idmfc.h index 1b5f03ee..8319aabe 100644 --- a/netgames/includes/idmfc.h +++ b/netgames/includes/idmfc.h @@ -1030,7 +1030,7 @@ public: // DMFCBase::GetPlayerRecord // // Returns a pointer to the player record at the given slot (passed in slot must be in the range - //0<=slotsend_len[i]; - NetStatistics.tcp_total_packets_sent--; // decrement because we are going to inc - // in nw_SendWithID + NetStatistics.tcp_total_packets_sent--; // decrement because we are going to inc + // in nw_SendWithID NetStatistics.tcp_total_bytes_sent -= len; // see above NetStatistics.tcp_total_packets_resent++; NetStatistics.tcp_total_bytes_resent += len; @@ -2948,8 +2948,8 @@ void nw_ReliableResend(void) { send_address.connection_type = NP_IPX; int len = RELIABLE_PACKET_HEADER_ONLY_SIZE + rsocket->send_len[i]; - NetStatistics.spx_total_packets_sent--; // decrement because we are going to inc - // in nw_SendWithID + NetStatistics.spx_total_packets_sent--; // decrement because we are going to inc + // in nw_SendWithID NetStatistics.spx_total_bytes_sent -= len; // see above NetStatistics.spx_total_packets_resent++; NetStatistics.spx_total_bytes_resent += len; @@ -2992,8 +2992,8 @@ void nw_ReliableResend(void) { send_address.connection_type = NP_TCP; int len = RELIABLE_PACKET_HEADER_ONLY_SIZE + rsocket->send_len[i]; - NetStatistics.tcp_total_packets_sent--; // decrement because we are going to inc - // in nw_SendWithID + NetStatistics.tcp_total_packets_sent--; // decrement because we are going to inc + // in nw_SendWithID NetStatistics.tcp_total_bytes_sent -= len; // see above NetStatistics.tcp_total_packets_resent++; NetStatistics.tcp_total_bytes_resent += len; @@ -3014,8 +3014,8 @@ void nw_ReliableResend(void) { send_address.connection_type = NP_IPX; int len = RELIABLE_PACKET_HEADER_ONLY_SIZE + rsocket->send_len[i]; - NetStatistics.spx_total_packets_sent--; // decrement because we are going to inc - // in nw_SendWithID + NetStatistics.spx_total_packets_sent--; // decrement because we are going to inc + // in nw_SendWithID NetStatistics.spx_total_bytes_sent -= len; // see above NetStatistics.spx_total_packets_resent++; NetStatistics.spx_total_bytes_resent += len; diff --git a/physics/Collide.cpp b/physics/Collide.cpp index 1cd64963..0b0a49c5 100644 --- a/physics/Collide.cpp +++ b/physics/Collide.cpp @@ -939,7 +939,7 @@ void bump_this_object(object *objp, object *other_objp, vector *force, vector *c */ //#define DAMAGE_SCALE 128 // Was 32 before 8:55 am on Thursday, September 15, changed by MK, walls -//were hurting me more than robots! #define DAMAGE_THRESHOLD (F1_0/3) #define WALL_LOUDNESS_SCALE (20) +// were hurting me more than robots! #define DAMAGE_THRESHOLD (F1_0/3) #define WALL_LOUDNESS_SCALE (20) // float force_force = 50.0; @@ -2023,7 +2023,7 @@ void bump_two_objects(object *object0, object *object1, vector *collision_point, // force = object0->mtype.phys_info.velocity - object1->mtype.phys_info.velocity; // force *= 2*(object0->mtype.phys_info.mass * object1->mtype.phys_info.mass)/(object0->mtype.phys_info.mass + - //object1->mtype.phys_info.mass); + // object1->mtype.phys_info.mass); // if(!(object1->mtype.phys_info.flags & PF_PERSISTENT)) // bump_this_object(object1, object0, &force, collision_point, damage_flag); diff --git a/physics/FindIntersection.cpp b/physics/FindIntersection.cpp index e79c2004..2558542a 100644 --- a/physics/FindIntersection.cpp +++ b/physics/FindIntersection.cpp @@ -1729,8 +1729,8 @@ int check_vector_to_object(vector *intp, float *col_dist, vector *p0, vector *p1 // if obj is player, and bumping into other player or a weapon of another coop player, reduce radius // if (obj->type == OBJ_PLAYER && // ((otherobj->type == OBJ_PLAYER) || - // ((Game_mode&GM_MULTI_COOP) && otherobj->type == OBJ_WEAPON && otherobj->ctype.laser_info.parent_type == - //OBJ_PLAYER))) size = size/2; + // ((Game_mode&GM_MULTI_COOP) && otherobj->type == OBJ_WEAPON && otherobj->ctype.laser_info.parent_type + //== OBJ_PLAYER))) size = size/2; // This accounts for relative position vs. relative velocity if (fvi_objnum != -1 && still_obj->movement_type == MT_PHYSICS && Objects[fvi_objnum].movement_type == MT_PHYSICS) { @@ -2510,7 +2510,7 @@ void make_trigger_face_list(int last_sim_faces) { vertex_ptr_list[count] = &cur_room->verts[cur_room->faces[i].face_verts[count]]; // mprintf((0, "FVI:In trigger %f to %f crossed %f\n", fvi_query_ptr->p0->z, fvi_hit_data_ptr->hit_pnt.z, - //vertex_ptr_list[0]->z)); + // vertex_ptr_list[0]->z)); face_normal = cur_room->faces[i].normal; @@ -2733,7 +2733,7 @@ int fvi_FindIntersection(fvi_query *fq, fvi_info *hit_data, bool no_subdivision) if (s_hit_type != HIT_NONE) { // mprintf((0, "Hit %d at %f, %f, %f\n", s_hit_type, - //XYZ(&fvi_new_hit_data.hit_pnt))); + // XYZ(&fvi_new_hit_data.hit_pnt))); break; } @@ -3428,14 +3428,15 @@ void check_hit_obj(int objnum) { goto sphere_sphere; // pos = obj->pos + - //obj->anim_sphere_offset; dist = vm_VectorDistance(&pos, &fvi_anim_sphere_p0); size = - //Poly_models[obj->rtype.pobj_info.model_num].anim_size; + // obj->anim_sphere_offset; dist = vm_VectorDistance(&pos, + // &fvi_anim_sphere_p0); size = + // Poly_models[obj->rtype.pobj_info.model_num].anim_size; // if((dist <= size + - //fvi_anim_sphere_rad) - // || check_vector_to_object(&hit_point, - //&cur_dist, &fvi_anim_sphere_p0,&fvi_anim_sphere_p1, fvi_anim_sphere_rad, &Objects[objnum], - //&Objects[fvi_query_ptr->thisobjnum]) + // fvi_anim_sphere_rad) + // || + //check_vector_to_object(&hit_point, &cur_dist, &fvi_anim_sphere_p0,&fvi_anim_sphere_p1, + //fvi_anim_sphere_rad, &Objects[objnum], &Objects[fvi_query_ptr->thisobjnum]) // { fvi_curobj = objnum; fvi_moveobj = m_obj_index; @@ -3905,8 +3906,8 @@ inline void check_terrain_node(int cur_node, bool f_check_local_nodes, bool f_ch &fvi_hit_data_ptr->hit_pnt, &face_normal, vertex_ptr_list, 3, fvi_query_ptr->rad); } - // if(Objects[fvi_query_ptr->thisobjnum].type == OBJ_CLUTTER) mprintf((0, "Y = %f\n", - //Objects[fvi_query_ptr->thisobjnum].pos.y)); + // if(Objects[fvi_query_ptr->thisobjnum].type == OBJ_CLUTTER) mprintf((0, "Y = + //%f\n", Objects[fvi_query_ptr->thisobjnum].pos.y)); // // chrisnote - closest hit should be tracked... So, we can call BBPI once with @@ -4365,8 +4366,8 @@ void fvi_rooms_objs(void) { // Determines if a face draws with alpha blending // Parameters: fp - pointer to the face in question // bm_handle - the handle for the bitmap for this frame, or -1 if don't care about -//transparence Returns: bitmask describing the alpha blending for the face the return bits are the ATF_ flags in -//renderer.h +// transparence Returns: bitmask describing the alpha blending for the face the return +// bits are the ATF_ flags in renderer.h inline int GetFaceAlpha(face *fp, int bm_handle) { int ret = AT_ALWAYS; if (GameTextures[fp->tmap].flags & TF_SATURATE) { diff --git a/physics/physics.cpp b/physics/physics.cpp index 89d2b62e..99d1ec34 100644 --- a/physics/physics.cpp +++ b/physics/physics.cpp @@ -399,7 +399,7 @@ bool PhysicsDoSimRot(object *obj, float frame_time, matrix *orient, vector *rott //.000001) // { // if(!(fabs(rotvel->x) > .000001 || fabs(rotvel->y) > .000001 || fabs(rotvel->z) > .000001 || *turnroll != - //0)) + // 0)) // { // return false; // } @@ -631,7 +631,7 @@ bool PhysicsDoSimRot(object *obj, float frame_time, matrix *orient, vector *rott } // PhysicsApplyConstRotForce(*obj, level_rotthrust, *rotvel, - //frame_time); + // frame_time); } } } @@ -668,7 +668,7 @@ bool PhysicsDoSimRot(object *obj, float frame_time, matrix *orient, vector *rott } // mprintf((0, " a %f, %f, %f,\n%f, %f, %f,\n%f %f %f\n\n", XYZ(&obj->orient.fvec), XYZ(&obj->orient.rvec), - //XYZ(&obj->orient.uvec))); + // XYZ(&obj->orient.uvec))); // Make sure the new orientation is valid vm_Orthogonalize(orient); @@ -1250,7 +1250,7 @@ void do_physics_sim(object *obj) { // mprintf((0, "Obj %d Flew backwards!\n", OBJNUM(obj))); // mprintf((0, "PHYSICS NOTE: (%f, %f, %f) to (%f, %f, %f)\n", XYZ(&start_pos), - //XYZ(&obj->pos))); don't change position or sim_time_remaining + // XYZ(&obj->pos))); don't change position or sim_time_remaining ObjSetPos(obj, &start_pos, start_room, NULL, false); @@ -1272,7 +1272,7 @@ void do_physics_sim(object *obj) { if (sim_time_remaining > old_sim_time_remaining) { // mprintf((0,"PHYSICS WARNING: Bogus sim_time_remaining = %15.13f, old = //%15.13f\nAttempted d = %15.13f, actual = %15.13f\n",sim_time_remaining,old_sim_time_remaining, - //attempted_dist, actual_dist)); + // attempted_dist, actual_dist)); // Int3(); sim_time_remaining = old_sim_time_remaining; moved_time = 0.0; @@ -1465,15 +1465,16 @@ void do_physics_sim(object *obj) { // if(!f_forcefield && !(f_volatile && obj->type == OBJ_PLAYER)) // { // if(obj->mtype.phys_info.coeff_restitution != 1.0f) - // obj->mtype.phys_info.velocity -= (obj->mtype.phys_info.velocity * (1.0f - - //obj->mtype.phys_info.coeff_restitution)); + // obj->mtype.phys_info.velocity -= (obj->mtype.phys_info.velocity * (1.0f + //- obj->mtype.phys_info.coeff_restitution)); // } // if(!f_forcefield && !(f_volatile && obj->type == OBJ_PLAYER)) // bump_obj_against_fixed(obj, &hit_info.hit_face_pnt[0], //&hit_info.hit_wallnorm[0]); // - // if(hit_info.hit_wallnorm[0].y > .4 && (vm_GetMagnitude(&obj->mtype.phys_info.velocity) < .001f + // if(hit_info.hit_wallnorm[0].y > .4 && (vm_GetMagnitude(&obj->mtype.phys_info.velocity) < + //.001f //|| obj->mtype.phys_info.velocity * hit_info.hit_wallnorm[0] <= 0.0f)) // { // mprintf((0, "At Rest!\n")); @@ -1785,7 +1786,7 @@ void do_physics_sim(object *obj) { f_continue_sim = true; // if((obj->type == OBJ_CLUTTER)&&(Objects[hit_info.hit_object[0]].type == - //OBJ_CLUTTER)) + // OBJ_CLUTTER)) // { // f_continue_sim = false; // } @@ -1819,7 +1820,7 @@ void do_physics_sim(object *obj) { obj->mtype.phys_info.velocity = Zero_vector; } else { // mprintf((0, "PHYSICS NOTE: Too many collisions for non-player object %d (%d to %d)!\n", - //objnum, init_room, obj->roomnum)); obj->flags |= OF_DEAD; + // objnum, init_room, obj->roomnum)); obj->flags |= OF_DEAD; // obj->mtype.phys_info.velocity /= 2.0f; // obj->mtype.phys_info.rotvel /= 2.0f; @@ -2477,7 +2478,7 @@ void do_walking_sim(object *obj) { mprintf((0, "Obj %d Walked backwards!\n", OBJNUM(obj))); // mprintf((0, "PHYSICS NOTE: (%f, %f, %f) to (%f, %f, %f)\n", XYZ(&start_pos), - //XYZ(&obj->pos))); don't change position or sim_time_remaining + // XYZ(&obj->pos))); don't change position or sim_time_remaining ObjSetPos(obj, &start_pos, start_room, NULL, false); @@ -2582,7 +2583,7 @@ void do_walking_sim(object *obj) { bounced = 1; // this object bounced // mprintf((0, "(%f, %f, %f) before bounce\n", - //XYZ(&obj->mtype.phys_info.velocity))); + // XYZ(&obj->mtype.phys_info.velocity))); obj->mtype.phys_info.velocity += hit_info.hit_wallnorm[0] * (wall_part * -1.0f); if (obj->mtype.phys_info.coeff_restitution != 1.0f) @@ -2817,7 +2818,7 @@ void do_walking_sim(object *obj) { mprintf((0, "PHYSICS NOTE: Too many collisions for player!\n")); } else { // mprintf((0, "PHYSICS NOTE: Too many collisions for non-player object %d (%d to %d)!\n", - //objnum, init_room, obj->roomnum)); obj->flags |= OF_DEAD; + // objnum, init_room, obj->roomnum)); obj->flags |= OF_DEAD; // obj->mtype.phys_info.velocity /= 2.0f; // obj->mtype.phys_info.rotvel /= 2.0f; diff --git a/scripts/AIGame.cpp b/scripts/AIGame.cpp index e4826e07..1c7aab24 100644 --- a/scripts/AIGame.cpp +++ b/scripts/AIGame.cpp @@ -4761,7 +4761,7 @@ bool GuideBot::SetMode(int me, char mode) { memory->next_ambient_time = Game_GetTime() + 1.2f; // AI_AddGoal(me, AIG_MOVE_RELATIVE_OBJ_VEC, 0, 1.0f, -1, GF_KEEP_AT_COMPLETION, memory->my_player, - //GST_FVEC); AI_SetGoalCircleDist(me, 0, 40.0f); + // GST_FVEC); AI_SetGoalCircleDist(me, 0, 40.0f); pos += orient.fvec * 200.0f; @@ -7821,9 +7821,9 @@ void BarnSwallow::ComputeNextNestPnt(int me, vector *pos) { *pos += memory->nest_center; } -//#define BSCOMM_FOLLOW_ME 0 // send a percent chance so we can have a -//line sometimes #define BSCOMM_FOLLOW_CANCEL_FROM_FOLLOWER 2 #define BSCOMM_FOLLOW_CANCEL_FROM_LEADER -//3 #define BSCOMM_ATTACK_MY_TARGET 4 +//#define BSCOMM_FOLLOW_ME 0 // send a percent chance so we can have +//a line sometimes #define BSCOMM_FOLLOW_CANCEL_FROM_FOLLOWER 2 #define BSCOMM_FOLLOW_CANCEL_FROM_LEADER 3 +// #define BSCOMM_ATTACK_MY_TARGET 4 // BSCOMM_ARE_YOU_IN_MODE bool BarnSwallow::ReceiveCommand(int me, int it, gb_com *command) { diff --git a/scripts/aigame2.cpp b/scripts/aigame2.cpp index fe332d17..921b3bdd 100644 --- a/scripts/aigame2.cpp +++ b/scripts/aigame2.cpp @@ -981,8 +981,8 @@ bool aiBlackStormTrooper::OnNotify(int me_handle, tOSIRISEVTAINOTIFY *data) { //@@ if ((rand() % 100) < 60) { //@@ set_state(me_handle, STATE_SNIPE); //@@ } - //@@ memory->timer = Game_GetTime() + 2.0f + (rand() % 6)*0.5f; // use timer to switch - //states. + //@@ memory->timer = Game_GetTime() + 2.0f + (rand() % 6)*0.5f; // use timer to + //switch states. //@@ } break; @@ -1385,7 +1385,7 @@ retry_set_state: circle_dist = 40.0f; AI_Value(me_handle, VF_SET, AIV_F_CIRCLE_DIST, &circle_dist); // AI_AddGoal(me_handle, AIG_WANDER_AROUND, 3, 1.0f, -1, GF_ORIENT_VELOCITY | GF_NOTIFIES | - //GF_KEEP_AT_COMPLETION, &pos, room_number); + // GF_KEEP_AT_COMPLETION, &pos, room_number); AI_AddGoal(me_handle, AIG_MOVE_RELATIVE_OBJ, 2, 1.0f, -1, GF_KEEP_AT_COMPLETION | GF_OBJ_IS_TARGET, NULL, 0); flags = AIF_DISABLE_MELEE; diff --git a/scripts/aigame4.cpp b/scripts/aigame4.cpp index 3b1293d8..40616730 100644 --- a/scripts/aigame4.cpp +++ b/scripts/aigame4.cpp @@ -876,8 +876,8 @@ void MercEndBoss::DoFrame(int me) { DF_BLAST_RING | DF_LOSES_ANTIGRAV | DF_EXPL_LARGE | DF_FIREBALL | DF_BREAKS_APART | DF_DEBRIS_SMOKES, 0.0f, 0.0f); // Obj_Kill(me, OBJECT_HANDLE_NONE, 1000.0f, - //DF_BREAKS_APART|DF_BLAST_RING|DF_LOSES_ANTIGRAV|DF_EXPL_LARGE|DF_CONTACT_BREAKS_APART|DF_CONTACT_BLAST_RING|DF_DEBRIS_SMOKES|DF_DEBRIS_FIREBALL|DF_DEBRIS_BLAST_RING, - //0.0f, 0.0f); + // DF_BREAKS_APART|DF_BLAST_RING|DF_LOSES_ANTIGRAV|DF_EXPL_LARGE|DF_CONTACT_BREAKS_APART|DF_CONTACT_BLAST_RING|DF_DEBRIS_SMOKES|DF_DEBRIS_FIREBALL|DF_DEBRIS_BLAST_RING, + // 0.0f, 0.0f); Obj_Kill(memory->turret_object, OBJECT_HANDLE_NONE, 1000.0f, DF_BREAKS_APART | DF_BLAST_RING | DF_LOSES_ANTIGRAV | DF_EXPL_LARGE | DF_CONTACT_BREAKS_APART | DF_CONTACT_BLAST_RING | DF_DEBRIS_SMOKES | DF_DEBRIS_FIREBALL | DF_DEBRIS_BLAST_RING, @@ -979,7 +979,8 @@ void MercEndBoss::DoFrame(int me) { // else // { // vector bf_pos = ray.hit_point + (orient.fvec - //* 9.0f); Obj_Create(OBJ_POWERUP, memory->wallhit_id, 76, &bf_pos); + //* 9.0f); Obj_Create(OBJ_POWERUP, + //memory->wallhit_id, 76, &bf_pos); /// //mprintf(0, "HERE X\n"); // } } diff --git a/scripts/lnx/osiris_common.h b/scripts/lnx/osiris_common.h index c78e5f9d..efebe84f 100644 --- a/scripts/lnx/osiris_common.h +++ b/scripts/lnx/osiris_common.h @@ -1021,8 +1021,8 @@ typedef struct { } tOSIRISEVTCREATED; // struct for EVT_CREATED data typedef struct { - ubyte is_dying; // if this is !=0 than the event is coming because it is - // really being destroyed. Else it is due to the level ending. + ubyte is_dying; // if this is !=0 than the event is coming because it is + // really being destroyed. Else it is due to the level ending. } tOSIRISEVTDESTROY; // struct for EVT_DESTROY data typedef struct { diff --git a/scripts/lnx/osiris_import.h b/scripts/lnx/osiris_import.h index 57410d2a..67bc9ff2 100644 --- a/scripts/lnx/osiris_import.h +++ b/scripts/lnx/osiris_import.h @@ -469,8 +469,10 @@ OSIRISEXTERN OMMS_Detach_fp OMMS_Detach; // Only has affect if you are attached to the memory. Memory will _ONLY_ be deleted when the // following conditions are meant for the shared memory block: // 1) The reference count for the global memory is at 0 (OMMS_Attach() adds to reference count, OMMS_Detach() -//subtracts). 2) OMMS_Free() has been called for the block of global memory. The conditions can happen in any order, but -//as soon as both are satisfied, the memory becomes deleted and any pointer returned by OMMS_Attach() becomes invalid. +// subtracts). 2) OMMS_Free() has been called for the block of global memory. The conditions can happen in any order, +// but +// as soon as both are satisfied, the memory becomes deleted and any pointer returned by OMMS_Attach() becomes +// invalid. // // handle : the value returned by OMMS_Malloc() typedef void (*OMMS_Free_fp)(OMMSHANDLE handle); diff --git a/scripts/osiris_common.h b/scripts/osiris_common.h index c1ba25cc..9ce1898d 100644 --- a/scripts/osiris_common.h +++ b/scripts/osiris_common.h @@ -1002,8 +1002,8 @@ typedef struct { } tOSIRISEVTCREATED; // struct for EVT_CREATED data typedef struct { - ubyte is_dying; // if this is !=0 than the event is coming because it is - // really being destroyed. Else it is due to the level ending. + ubyte is_dying; // if this is !=0 than the event is coming because it is + // really being destroyed. Else it is due to the level ending. } tOSIRISEVTDESTROY; // struct for EVT_DESTROY data typedef struct { diff --git a/scripts/osiris_import.h b/scripts/osiris_import.h index a1a70773..8515acac 100644 --- a/scripts/osiris_import.h +++ b/scripts/osiris_import.h @@ -534,8 +534,10 @@ OSIRISEXTERN OMMS_Detach_fp OMMS_Detach; // Only has affect if you are attached to the memory. Memory will _ONLY_ be deleted when the // following conditions are meant for the shared memory block: // 1) The reference count for the global memory is at 0 (OMMS_Attach() adds to reference count, OMMS_Detach() -//subtracts). 2) OMMS_Free() has been called for the block of global memory. The conditions can happen in any order, but -//as soon as both are satisfied, the memory becomes deleted and any pointer returned by OMMS_Attach() becomes invalid. +// subtracts). 2) OMMS_Free() has been called for the block of global memory. The conditions can happen in any order, +// but +// as soon as both are satisfied, the memory becomes deleted and any pointer returned by OMMS_Attach() becomes +// invalid. // // handle : the value returned by OMMS_Malloc() typedef void (*OMMS_Free_fp)(OMMSHANDLE handle); diff --git a/sndlib/hlsoundlib.cpp b/sndlib/hlsoundlib.cpp index c8ae3b1e..9c4d82e9 100644 --- a/sndlib/hlsoundlib.cpp +++ b/sndlib/hlsoundlib.cpp @@ -715,7 +715,7 @@ void hlsSystem::BeginSoundFrame(bool f_in_game) { if (m_sound_objects[i].m_obj_type_flags & SIF_TOO_FAR) { if (m_sound_objects[i].m_obj_type_flags & SIF_LOOPING) { // while(m_sound_objects[i].play_info.m_samples_played >= - //Sounds[m_sound_objects[i].m_sound_index].loop_end) + // Sounds[m_sound_objects[i].m_sound_index].loop_end) // { // m_sound_objects[i].play_info.m_samples_played -= //(Sounds[m_sound_objects[i].m_sound_index].loop_end - Sounds[m_sound_objects[i].m_sound_index].loop_start); diff --git a/ui/UISystem.cpp b/ui/UISystem.cpp index 1e0c46ad..fa6bdcdc 100644 --- a/ui/UISystem.cpp +++ b/ui/UISystem.cpp @@ -279,7 +279,7 @@ bool ui_MousePoll(bool buttons) { // if bX_count is 0, then repeat processing can occur, otherwise only real mouse events are processed. if (ddio_MouseGetEvent(&msebtn, &state)) { // mprintf((2, "mouse #%d state %d at %04d %04d\n", msebtn, UI_input.b1_status, - //UI_input.mx, UI_input.my)); + // UI_input.mx, UI_input.my)); if (msebtn == 0) { UI_input.b1_last_status = UI_input.b1_status; UI_input.b1_status = state ? UIMSEBTN_PRESSED : UIMSEBTN_RELEASED; diff --git a/win32/WinController.cpp b/win32/WinController.cpp index 8553cda6..6d280877 100644 --- a/win32/WinController.cpp +++ b/win32/WinController.cpp @@ -1274,7 +1274,8 @@ sbyte gameWinController::get_button_controller(ubyte btn) { // start from controller 2 because 0, and 1 are reserved for keyboard and mouse for (int i = 2; i < m_NumControls; i++) - //@@ if (((unsigned)btn < m_ControlList[i].buttons) && !(m_ControlList[i].btnmask & mask) && (m_ControlList[i].id + //@@ if (((unsigned)btn < m_ControlList[i].buttons) && !(m_ControlList[i].btnmask & mask) && + //(m_ControlList[i].id //!= CTID_INVALID)) { if (((unsigned)btn < m_ControlList[i].buttons) && (m_ControlList[i].id != CTID_INVALID)) { //@@ m_ControlList[i].btnmask |= mask;