Cleans up more ifdefs which are never changed.

Cleans up DIAGONAL ifdef in findpath which is always defined.
Cleans up MPEGMOVIE ifdef which is always undefined.
Cleans up cuts ifdef which is alwasy undefined.

Author: OmniBlade

common/font.cpp

@@ -260,21 +260,6 @@ void* Load_Font(char const* name)
         return ((void*)(intptr_t)errno);
     }
 
-#ifdef cuts
-    if (Find_File(name)) {
-        fh = Open_File(name, READ);
-        if (Read_File(fh, (char*)&size, 2) != 2)
-            return (NULL);
-
-        ptr = (char*)Alloc(size, MEM_NORMAL);
-        *(short*)ptr = size;
-        Read_File(fh, ptr + 2, size - 2);
-        Close_File(fh);
-    } else {
-        return (NULL);
-    }
-#endif
-
     //
     // verify that the file loaded is a valid font file.
     //

common/wsa.cpp

@@ -649,208 +649,6 @@ bool Animate_Frame(void* handle,
     view.Unlock();
     return true;
 }
-/***************************************************************************
- * ANIMATE_FRAME -- Displays a frame of a given animation                  *
- *                                                                         *
- * INPUT:   void *handle to the animation.                                 *
- *          int frame_number wanted to be displayed                       *
- *          int x_pixel position of left side of animation on page        *
- *          int y_pixel position of top of animation on page              *
- *                                                                         *
- * OUTPUT:  bool if successfull or not.                                   *
- *                                                                         *
- * WARNINGS:                                                               *
- *                                                                         *
- * HISTORY:                                                                *
- *   11/27/1991  SB : Created.                                             *
- *=========================================================================*/
-//#pragma argsused
-#ifdef cuts
-bool Animate_Frame(void* handle,
-                   GraphicViewPortClass& view,
-                   int frame_number,
-                   int x_pixel,
-                   int y_pixel,
-                   WSAType flags_and_prio,
-                   void* magic_cols,
-                   void* magic)
-{
-    SysAnimHeaderType* sys_header; // fix up the void pointer past in.
-    int curr_frame;                // current frame we are on.
-    int total_frames;              // number of frames in anim.
-    int distance;                  // distance to desired frame.
-    int search_dir;                // direcion to search for desired frame.
-    int search_frames;             // How many frames to search.
-    int loop;                      // Just a loop varible.
-    char* frame_buffer;            // our destination.
-    bool direct_to_dest;           // are we going directly to the destination?
-    int dest_width;                // the width of the destination buffer or page.
-
-    // Assign local pointer to the beginning of the buffer where the system information
-    // resides
-    sys_header = (SysAnimHeaderType*)handle;
-
-    // Get the total number of frames
-    total_frames = sys_header->total_frames;
-
-    // Are the animation handle and the frame number valid?
-    if (!handle || (total_frames <= frame_number)) {
-        return false;
-    }
-
-    // Decide if we are going to a page or a viewport (part of a buffer).
-    dest_width = view.Get_Width() + view.Get_XAdd();
-
-    //
-    // adjust x_pixel and y_pixel by system pixel_x and pixel_y respectively.
-    //
-    x_pixel += (short)sys_header->pixel_x;
-    y_pixel += (short)sys_header->pixel_y;
-
-    //
-    // Check to see if we are using a buffer inside of the animation buffer or if
-    // it is being drawn directly to the destination page or buffer.
-    //
-    if (sys_header->flags & WSA_TARGET_IN_BUFFER) {
-        // Get a pointer to the frame in animation buffer.
-        frame_buffer = (char*)Add_Long_To_Pointer(sys_header, sizeof(SysAnimHeaderType));
-        direct_to_dest = false;
-    } else {
-        frame_buffer = (char*)view.Get_Offset();
-        frame_buffer += (y_pixel * dest_width) + x_pixel;
-        direct_to_dest = true;
-    }
-    //
-    // If current_frame is equal to tatal_frames, then no animations have taken place
-    // so must uncompress frame 0 in delta buffer to the frame_buffer/page if it
-    // exists.
-    //
-    if (sys_header->current_frame == total_frames) {
-
-        // Call apply delta telling it wether to copy or to xor depending on if the
-        // target is a page or a buffer.
-
-        if (!(sys_header->flags & WSA_FRAME_0_ON_PAGE)) {
-            if (direct_to_dest) {
-
-                // The last parameter says weather to copy or to XOR.  If  the
-                // first frame is a DELTA, then it must be XOR'd.  A true is
-                // copy while false is XOR.
-                Apply_XOR_Delta_To_Page_Or_Viewport(frame_buffer,
-                                                    sys_header->delta_buffer,
-                                                    sys_header->pixel_width,
-                                                    dest_width, // dest_width - sys_header->pixel_width,
-                                                    (sys_header->flags & WSA_FRAME_0_IS_DELTA) ? DO_XOR : DO_COPY);
-            } else {
-                Apply_XOR_Delta(frame_buffer, sys_header->delta_buffer);
-            }
-        }
-        sys_header->current_frame = 0;
-    }
-
-    //
-    // Get the current frame
-    // If no looping aloud, are the trying to do it anyways?
-    //
-    curr_frame = sys_header->current_frame;
-#if (false)
-    // This is commented out since we will let them loop even though they should
-    // not - it will be slower.
-    if ((sys_header->flags & WSA_LINEAR_ONLY) && (frame_number < cur_frame)) {
-        return false;
-    }
-#endif
-
-    // Get absoulte distance from our current frame to the target frame
-    distance = ABS(curr_frame - frame_number);
-
-    // Assume we are searching right
-    search_dir = 1;
-
-    // Calculate the number of frames to search if we go right and wrap
-
-    if (frame_number > curr_frame) {
-        search_frames = total_frames - frame_number + curr_frame;
-
-        // Is going right faster than going backwards?
-        // Or are they trying to loop when the should not?
-        if ((search_frames < distance) && !(sys_header->flags & WSA_LINEAR_ONLY)) {
-            search_dir = -1; // No, so go left
-        } else {
-            search_frames = distance;
-        }
-    } else {
-        search_frames = total_frames - curr_frame + frame_number;
-
-        // Is going right faster than going backwards?
-        // Or are they trying to loop when the should not?
-        if ((search_frames >= distance) || (sys_header->flags & WSA_LINEAR_ONLY)) {
-            search_dir = -1; // No, so go left
-            search_frames = distance;
-        }
-    }
-
-    // Take care of the case when we are searching right (possibly right)
-
-    if (search_dir > 0) {
-        for (loop = 0; loop < search_frames; loop++) {
-
-            // Move the logical frame number ordinally right
-            curr_frame += search_dir;
-
-            Apply_Delta(sys_header, curr_frame, frame_buffer, dest_width);
-
-            // Adjust the current frame number, taking into consideration that we could
-            // have wrapped
-
-            if (curr_frame == total_frames) {
-                curr_frame = 0;
-            }
-        }
-    } else {
-        for (loop = 0; loop < search_frames; loop++) {
-
-            // If we are going backwards and we are on frame 0, the delta to get
-            // to the last frame is the n + 1 delta (wrap delta)
-
-            if (curr_frame == 0) {
-                curr_frame = total_frames;
-            }
-
-            Apply_Delta(sys_header, curr_frame, frame_buffer, dest_width);
-
-            curr_frame += search_dir;
-        }
-    }
-
-    sys_header->current_frame = frame_number;
-
-    // If we did this all in a hidden buffer, then copy it to the desired page or viewport.
-    if (sys_header->flags & WSA_TARGET_IN_BUFFER) {
-#if true
-
-        Buffer_To_Page(x_pixel, y_pixel, sys_header->pixel_width, sys_header->pixel_height, frame_buffer, view);
-
-#else
-        int flags = ((unsigned short)flags_and_prio & 0xFF00u) >> 12u;
-        int pri = flags_and_prio & 0x00FF;
-
-        Buffer_Bitblit_To_LogicPage(x_pixel,
-                                    y_pixel,
-                                    sys_header->pixel_width,
-                                    sys_header->pixel_height,
-                                    0,
-                                    flags,
-                                    frame_buffer,
-                                    pri,
-                                    magic_cols,
-                                    magic);
-#endif
-    }
-
-    return true;
-}
-#endif
 
 /***************************************************************************
  * ANIMATE_FRAME_COUNT -- Return Number of frames in an animation.         *