summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Michaël Banaan Ananas <happppp@users.noreply.github.com>2012-02-03 16:47:33 +0000
committer Michaël Banaan Ananas <happppp@users.noreply.github.com>2012-02-03 16:47:33 +0000
commitd652cbe57631ea85401204c713e09de47df9f86d (patch)
tree2be4e8c8ee83f365a0c869890ec67582dae5f8b9
parent7b1fa7644643d908bfe1690386fa8dc9bafce9f2 (diff)
small typofix (hello GuyveR800 :P)
-rw-r--r--src/emu/drawgfx.c4
-rw-r--r--src/emu/drawgfx.h4
-rw-r--r--src/emu/tilemap.h2
-rw-r--r--src/mame/video/seta.c2
-rw-r--r--src/mame/video/zaxxon.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/drawgfx.c b/src/emu/drawgfx.c
index d06d1d69c7a..1abd59f6315 100644
--- a/src/emu/drawgfx.c
+++ b/src/emu/drawgfx.c
@@ -1820,7 +1820,7 @@ void copybitmap_trans(bitmap_rgb32 &dest, bitmap_rgb32 &src, int flipx, int flip
/*-------------------------------------------------
copyscrollbitmap - copy from one bitmap to
another, copying all unclipped pixels, and
- applying scrolling to one or more rows/colums
+ applying scrolling to one or more rows/columns
-------------------------------------------------*/
void copyscrollbitmap(bitmap_ind16 &dest, bitmap_ind16 &src, UINT32 numrows, const INT32 *rowscroll, UINT32 numcols, const INT32 *colscroll, const rectangle &cliprect)
@@ -1842,7 +1842,7 @@ void copyscrollbitmap(bitmap_rgb32 &dest, bitmap_rgb32 &src, UINT32 numrows, con
copyscrollbitmap_trans - copy from one bitmap
to another, copying all unclipped pixels
except those that match transpen, and applying
- scrolling to one or more rows/colums
+ scrolling to one or more rows/columns
-------------------------------------------------*/
template<class _BitmapClass>
diff --git a/src/emu/drawgfx.h b/src/emu/drawgfx.h
index 44d9b89030b..6a80d16ebb4 100644
--- a/src/emu/drawgfx.h
+++ b/src/emu/drawgfx.h
@@ -313,11 +313,11 @@ void copybitmap_trans(bitmap_rgb32 &dest, bitmap_rgb32 &src, int flipx, int flip
scrolls as a whole in at least one direction.
*/
-/* copy from one bitmap to another, copying all unclipped pixels, and applying scrolling to one or more rows/colums */
+/* copy from one bitmap to another, copying all unclipped pixels, and applying scrolling to one or more rows/columns */
void copyscrollbitmap(bitmap_ind16 &dest, bitmap_ind16 &src, UINT32 numrows, const INT32 *rowscroll, UINT32 numcols, const INT32 *colscroll, const rectangle &cliprect);
void copyscrollbitmap(bitmap_rgb32 &dest, bitmap_rgb32 &src, UINT32 numrows, const INT32 *rowscroll, UINT32 numcols, const INT32 *colscroll, const rectangle &cliprect);
-/* copy from one bitmap to another, copying all unclipped pixels except those that match transpen, and applying scrolling to one or more rows/colums */
+/* copy from one bitmap to another, copying all unclipped pixels except those that match transpen, and applying scrolling to one or more rows/columns */
void copyscrollbitmap_trans(bitmap_ind16 &dest, bitmap_ind16 &src, UINT32 numrows, const INT32 *rowscroll, UINT32 numcols, const INT32 *colscroll, const rectangle &cliprect, UINT32 transpen);
void copyscrollbitmap_trans(bitmap_rgb32 &dest, bitmap_rgb32 &src, UINT32 numrows, const INT32 *rowscroll, UINT32 numcols, const INT32 *colscroll, const rectangle &cliprect, UINT32 transpen);
diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h
index 192f2879eda..4d29edc7765 100644
--- a/src/emu/tilemap.h
+++ b/src/emu/tilemap.h
@@ -571,7 +571,7 @@ private:
// scroll information
UINT32 m_scrollrows; // number of independently scrolled rows
- UINT32 m_scrollcols; // number of independently scrolled colums
+ UINT32 m_scrollcols; // number of independently scrolled columns
INT32 * m_rowscroll; // array of rowscroll values
INT32 * m_colscroll; // array of colscroll values
INT32 m_dx; // global horizontal scroll offset
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index 31e029d637b..ba918cf1098 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -69,7 +69,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
[ Floating Tilemap ]
- There's a floating tilemap made of vertical colums composed of 2x16
+ There's a floating tilemap made of vertical columns composed of 2x16
"sprites". Each 32 consecutive "sprites" define a column.
For column I:
diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c
index b1c74284be2..0f8f3d474ae 100644
--- a/src/mame/video/zaxxon.c
+++ b/src/mame/video/zaxxon.c
@@ -359,7 +359,7 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons
srcy = vf + ((state->m_bg_position << 1) ^ 0xfff) + 1;
src = &pixmap.pix16(srcy & ymask);
- /* loop over visible colums */
+ /* loop over visible columns */
for (x = cliprect.min_x; x <= cliprect.max_x; x++)
{
/* start with HF = flipped H signals */