diff options
author | Paul Gilbert | 2014-03-01 17:28:24 -0500 |
---|---|---|
committer | Paul Gilbert | 2014-03-01 17:28:24 -0500 |
commit | 7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e (patch) | |
tree | 96de4f3470bd9bcc81bbae82a3e1c59f523a8edf /engines/tony/mpal/mpal.h | |
parent | badb8d97444767b7d8fea0f877ac044249696a5f (diff) | |
parent | 2218d14fb5276724c757406d5ac1ec581160721b (diff) | |
download | scummvm-rg350-7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e.tar.gz scummvm-rg350-7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e.tar.bz2 scummvm-rg350-7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e.zip |
Merge branch 'master' into mads
Diffstat (limited to 'engines/tony/mpal/mpal.h')
-rw-r--r-- | engines/tony/mpal/mpal.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/tony/mpal/mpal.h b/engines/tony/mpal/mpal.h index 2d22ee8faf..af24c46697 100644 --- a/engines/tony/mpal/mpal.h +++ b/engines/tony/mpal/mpal.h @@ -8,17 +8,16 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * */ /* * This code is based on original Tony Tough source code @@ -392,7 +391,7 @@ void mpalFree(); * * @param wQueryType Type of query. The list is in the QueryTypes enum. * @returns 4 bytes depending on the type of query - * @remarks This is the specialised version of the original single mpalQuery + * @remarks This is the specialized version of the original single mpalQuery * method that returns numeric results. */ uint32 mpalQueryDWORD(uint16 wQueryType, ...); @@ -403,7 +402,7 @@ uint32 mpalQueryDWORD(uint16 wQueryType, ...); * * @param wQueryType Type of query. The list is in the QueryTypes enum. * @returns 4 bytes depending on the type of query - * @remarks This is the specialised version of the original single mpalQuery + * @remarks This is the specialized version of the original single mpalQuery * method that returns a pointer or handle. */ MpalHandle mpalQueryHANDLE(uint16 wQueryType, ...); @@ -414,7 +413,7 @@ MpalHandle mpalQueryHANDLE(uint16 wQueryType, ...); * * @param wQueryType Type of query. The list is in the QueryTypes enum. * @returns 4 bytes depending on the type of query - * @remarks This is the specialised version of the original single mpalQuery + * @remarks This is the specialized version of the original single mpalQuery * method that needs to run within a co-routine context. */ void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet); |